MultiRepos: merged with 0.12dev [T8431:8479/trunk]
Authored by: cboos 2009-08-20
Parent: [r8479]
Child: [r8481]