MultiRepos: Merged from 0.12dev [8299:8372/trunk].
Authored by: rblank 2009-07-27
Parent: [r8375]
Child: [r8377]