MultiRepos: merge from 0.12dev [9055:9078/trunk]
Authored by: cboos 2010-01-25
Parent: [r9078]
Child: [r9080]