MultiRepos: merged [8085:8170] from 0.12dev
Authored by: cboos 2009-05-01
Parent: [r8170]
Child: [r8172]