0.12dev: merged [7257-7258] from 0.11-stable via svnmerge
Authored by: cboos 2008-06-26
Parent: [r7258]
Child: [r7260]