0.11.5dev: merged r8205 from rework-testing branch
Authored by: cboos 2009-05-19
Parent: [r8209]
Child: [r8211]