removed the svnmerge-integrated property from trunk; it's confusing svnmerge in newly...