MultiRepos: merge from 0.12dev [T8836:8853]
Authored by: cboos 2009-11-24
Parent: [r8853]
Child: [r8855]