Argh, fixing svnmerge-integrated property.
Authored by: cboos 2007-04-24
Parent: [r5258]
Child: [r5260]