MultiRepos: Merged from 0.12dev[8429-8430/trunk].
Authored by: rblank 2009-07-31
Parent: [r8438]
Child: [r8440]