commit 02d00ea60e747eaff8172ac84266a35456822859
Merge: c6a19ec 33581f8
Author: Paul van Tilburg <paul@mozcode.nl>
Date:   Wed Jun 6 11:43:03 2012 +0200

    Merge branch 'support/isodoc-0.10' into development (closes: #26e4aa)