Reverted r4732 as the errors argument is not necessary and already exists as a flag.
The command used was: svn merge -r4732:4731 .
Authored by: bugman 2008-01-15
Parent: [r4732]
Child: [r4734]
