MultipleRepositorySupport branch synced with trunk [7540:7558/trunk]
Authored by: cboos 2008-09-25
Parent: [r7558]
Child: [r7560]