Fix for a bad edit of an svnmerge back at r17835.
Authored by: bugman 2012-10-16
Parent: [r17858]
Child: [r17860]