MultiRepos: merged from 0.12dev [7928:7948/trunk]
Authored by: cboos 2009-03-17
Parent: [r7948]
Child: [r7950]