0.12dev: merged revisions [7205:7206/branches/0.11-stable] via svnmerge (''escaping issue #7332'')
Authored by: cboos 2008-06-13
Parent: [r7210]
Child: [r7212]