MultiRepos: merge with [8875:8882/trunk]
Authored by: cboos 2009-12-06
Parent: [r8882]
Child: [r8884]