Update svnmerge information.
I think these versions have been merged...
Merge.
Fix some merge errors.