MultiRepos branch synced with trunk [7812:7827/trunk].
Authored by: cboos 2009-02-05
Parent: [r7828]
Child: [r7830]