MultiRepos: merge from 0.12dev [9078:9100/trunk]
Authored by: cboos 2010-01-29
Parent: [r9100]
Child: [r9102]