Reverted r12461 as this was the wrong way to do this.
The command used was: svn merge -r12461:12460 .
Authored by: bugman 2011-01-31
Parent: [r12463]
Child: [r12465]
