MultiRepos: merged from 0.12dev [8400:8420/trunk]
Authored by: cboos 2009-07-30
Parent: [r8425]
Child: [r8427]