MultiRepos: merged changes from 0.12dev
Authored by: cboos 2009-06-24
Parent: [r8298]
Child: [r8300]