Reverted r14006 as this should happen only in the main line.
The command used was: svn merge -r14006:14005 .
Authored by: bugman 2011-07-29
Parent: [r14006]
Child: [r14008]
