0.12dev: merged r7884 and r7885 from 0.11-stable
Authored by: cboos 2009-02-14
Parent: [r7885]
Child: [r7887]