MultiRepos: merged from 0.12dev [7828:7851/trunk]
Authored by: cboos 2009-02-09
Parent: [r7851]
Child: [r7853]