Reverted the last revision, r7204, as this included too much.
The command used was: svn merge -r7204:7203 .
Authored by: bugman 2008-08-17
Parent: [r7204]
Child: [r7206]