Reverted r4836 as it contained changes which should not have been committed.
The command used was: svn merge -r4836:4835 .
Authored by: bugman 2008-01-17
Parent: [r4836]
Child: [r4838]
