Testing: svnmerge.py fixup to account for [6513] already being integrated.
Authored by: ecarter 2008-02-17
Parent: [r6514]
Child: [r6516]
