MultiRepos: Merged from 0.12dev [9101:9112/trunk].
Authored by: rblank 2010-01-30
Parent: [r9112]
Child: [r9114]