MultiRepos: Merged from 0.12dev [9113:9118/trunk].
Authored by: rblank 2010-02-02
Parent: [r9118]
Child: [r9120]