MultiRepos: merged from 0.12dev [7876:7887/trunk]
Authored by: cboos 2009-02-14
Parent: [r7887]
Child: [r7889]