r7656 didn't modify the svnmerge-integrated property, redoing it with --record-only
Authored by: cboos 2008-11-12
Parent: [r7669]
Child: [r7671]
