MultiRepos: merged from 0.12dev [7985:8068/trunk]
Authored by: cboos 2009-04-06
Parent: [r8068]
Child: [r8070]