VcRefactoring: merge changes from log:trunk@...:3015
Authored by: cboos 2006-03-16
Parent: [r3015]
Child: [r3017]