MultipleRepositorySupport branch synced with trunk [6425:6486/trunk]
Authored by: cboos 2008-02-06
Parent: [r6487]
Child: [r6489]