MultiRepos: merged from 0.12dev [7949:7958/trunk]
Authored by: cboos 2009-03-22
Parent: [r7959]
Child: [r7961]