MultiRepos: Merged from 0.12dev [8373-8374/trunk].
Authored by: rblank 2009-07-27
Parent: [r8376]
Child: [r8378]