0.12dev: ported r7789 from 0.11-stable (svnmerge of r7789-7790 failed for some reason, merging one by one)
Authored by: cboos 2009-01-13
Parent: [r7791]
Child: [r7793]