MultiRepos: Merged from 0.12dev [8988:8995/trunk].
Authored by: rblank 2009-12-31
Parent: [r8995]
Child: [r8997]