Fix for the faulty svnmerge changes of the previous commit.
Authored by: bugman 2013-02-13
Parent: [r18466]
Child: [r18468]