Reverted r5933, as this change was incorrect.
The command used was: svn merge -r5933:5932 .
Authored by: bugman 2008-04-21
Parent: [r5933]
Child: [r5935]