MultiRepos: merged with 0.12dev [8259:8263/trunk]
Authored by: cboos 2009-06-10
Parent: [r8265]
Child: [r8267]