#8751: most of the changes did happen on trunk recently, removing the branch.
Authored by: cboos 2010-02-16
Parent: [r9192]
Child: [r9194]