MultipleRepositorySupport branch synced with trunk [6489:6535/trunk]
Authored by: cboos 2008-02-18
Parent: [r6535]
Child: [r6537]