0.12dev: merge all 0.11.6rc1 related changes
Authored by: cboos 2009-11-23
Parent: [r8846]
Child: [r8848]