Reverted r5501, as the behaviour of the tested code has been reverted to the original.
The command used was: svn merge -r5501:5500 .
Authored by: bugman 2008-04-09
Parent: [r5508]
Child: [r5510]
