Reverted r4654 as it was a mistake that broke almost everything, except the prompt.
The command used was: svn merge -r4654:4653 .
Authored by: semor 2008-01-11
Parent: [r4654]
Child: [r4656]
