Reverted r11913 as this was completely wrong and broke the reading of results files.
The command used was: svn merge -r11913:11912 .
Authored by: bugman 2010-12-20
Parent: [r11913]
Child: [r11915]
