MultiRepos: merge from 0.12dev [8868:8872/trunk]
Authored by: cboos 2009-12-03
Parent: [r8874]
Child: [r8876]