MultiRepos: Merged from 0.12dev [8996:9031/trunk].
Authored by: rblank 2010-01-08
Parent: [r9031]
Child: [r9033]