0.12dev: merged r8381 and r8382 from 0.11.6dev
Authored by: cboos 2009-07-28
Parent: [r8382]
Child: [r8384]