Reverted r4653 as it was a mistake.
The command used was: svn merge -r4653:4652 .
Authored by: semor 2008-01-11
Parent: [r4655]
Child: [r4657]