VcRefactoring: merge changes from [log:trunk@...:2944]
Authored by: cboos 2006-03-01
Parent: [r2944]
Child: [r2946]