MultipleRepositorySupport branch synced with trunk [6536:6601/trunk]
Authored by: cboos 2008-02-22
Parent: [r6601]
Child: [r6603]