Reverted the hack of r7290.
The command used was: svn merge -r7290:7289 .
Authored by: bugman 2008-09-24
Parent: [r7290]
Child: [r7292]