0.12dev: ported r7790 from 0.11-stable (apparently svnmerge has now some trouble when there are conflicts)
Authored by: cboos 2009-01-13
Parent: [r7792]
Child: [r7794]