MultiRepos: merged from 0.12dev [8274-8292/trunk]
Authored by: cboos 2009-06-24
Parent: [r8292]
Child: [r8294]