MultiRepos: Merged from 0.12dev [9032:9053/trunk].
Authored by: rblank 2010-01-20
Parent: [r9053]
Child: [r9055]