0.12dev: merged rework-testing branch [8000:8130/sandbox/rework-testing]
Authored by: cboos 2009-04-21
Parent: [r8130]
Child: [r8132]