Also commit the svnmerge modifications.
Authored by: jruigrok 2007-08-15
Parent: [r5917]
Child: [r5919]