Reverted r4656 which was itself a reversion of r4653.
The command used was: svn merge -r4656:4655 .
This import uncovered a problem solved by r4659 and can now be committed again.
Authored by: semor 2008-01-11
Parent: [r4660]
Child: [r4662]
