0.10.5dev: merged [7205:7206] from 0.11-stable (''escaping issue #7332'')
Authored by: cboos 2008-06-13
Parent: [r7206]
Child: [r7208]