MultipleRepositorySupport branch synced with trunk [6602:6814/trunk]
Authored by: cboos 2008-04-16
Parent: [r6820]
Child: [r6822]