Reverted r13910 as it contained more than just the svnmerge results.
The command used was: svn merge -r13910:13909 .
Authored by: bugman 2011-07-26
Parent: [r13910]
Child: [r13912]