0.12dev: merged r8205 from rework-testing branch
Authored by: cboos 2009-05-18
Parent: [r8205]
Child: [r8207]