MultipleRepositorySupport branch synced with trunk (3/3): merge of remaining code changes [7260:7539/trunk]
Authored by: cboos 2008-09-15
Parent: [r7541]
Child: [r7543]