From 6fa06d42f3bc0f5a99be1b428652f8ddb7203f2d Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Mon, 1 Mar 2010 17:43:44 +0000
Subject: [PATCH] Fix invalid svnmerge-integrated property edit from last
 commit.