Reverted r9272 as this was a mistake! It was a mix of svnmerge and other changes.
The command used was: svn merge -r9272:9271 .
Authored by: bugman 2009-07-22
Parent: [r9272]
Child: [r9274]