0.12dev: merged changes from 0.11-stable
Authored by: cboos 2009-06-24
Parent: [r8297]
Child: [r8299]