Reverted the last revision (r4861) as it included changes which should not have been committed.
The command used was: svn merge -r4861:4860 .
Authored by: bugman 2008-01-21
Parent: [r4861]
Child: [r4863]
