MultipleRepositorySupport branch synced with trunk [6854:7040/trunk]
Authored by: cboos 2008-05-09
Parent: [r7040]
Child: [r7042]