VcRefactoring: Merged [3324:3538/trunk] (painless!)
Authored by: cboos 2006-07-19
Parent: [r3538]
Child: [r3540]