MultiRepos: Merged from 0.12dev [8919:8987/trunk].
Authored by: rblank 2009-12-28
Parent: [r8987]
Child: [r8989]