MultiRepos: merged from 0.12dev [8379:8399/trunk]
Authored by: cboos 2009-07-30
Parent: [r8424]
Child: [r8426]