MultiRepos: merge remaining changes from 0.12dev
Authored by: cboos 2009-07-30
Parent: [r8427]
Child: [r8429]