0.12dev: merged r7689 from 0.11-stable via svnmerge
Authored by: cboos 2008-11-28
Parent: [r7730]
Child: [r7732]