Reverted r14083 and r14084 as these were causing segfaults!
The command used was: svn merge -r14084:14082 .
Authored by: bugman 2011-08-03
Parent: [r14084]
Child: [r14086]
