Reverted r11004 as this, for some unknown reason, undid the changes of r11001.
The command used was: svn merge -r11004:11003 .
Authored by: bugman 2010-03-16
Parent: [r11010]
Child: [r11012]
