MultiRepos: merged from 0.12dev [7852:7875/trunk]
Authored by: cboos 2009-02-13
Parent: [r7875]
Child: [r7877]