Reverted r4185 and r4186 as these conflict with changes now in the 1.3 line.
The command used was: svn merge -r4186:4184 .
Authored by: bugman 2008-01-07
Parent: [r4419]
Child: [r4421]
