Reverted r2942, the incorrectly set up svnmerge props.
The command used was: svn merge -r2942:2941 .
Authored by: bugman 2007-01-06
Parent: [r2942]
Child: [r2944]
