Reverted r10119 as this was not fixing the IO redirection problem.
The command used was: svn merge -r10119:10118 .
Authored by: bugman 2010-01-06
Parent: [r10119]
Child: [r10121]
