0.12dev: merged [7390-7394] via svnmerge from [source:branches/0.11-stable]
Authored by: cboos 2008-09-12
Parent: [r7530]
Child: [r7532]