0.12dev: r9029 was a backport to 0.11.7dev.
Authored by: cboos 2010-02-03
Parent: [r9121]
Child: [r9123]
