VcRefactoring: merge changes from [log:trunk@...:2983]
Authored by: cboos 2006-03-10
Parent: [r2983]
Child: [r2985]