MultipleRepositorySupport branch synced with trunk [7040:7259/trunk]
Authored by: cboos 2008-06-26
Parent: [r7259]
Child: [r7261]