Reverted r14133 as there is a better way of handling this.
The command used was: svn merge -r14133:14132 .
Authored by: bugman 2011-08-04
Parent: [r14133]
Child: [r14135]
