Merged log:sandbox/vc-refactoring@...:3009 in trunk. Should fix #1830.
Authored by: cboos 2006-03-16
Parent: [r3014]
Child: [r3016]