From 0d26eb69511508b973bdacfcde0e4f4eaf7dfd18 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 16 Mar 2008 17:32:59 +0000
Subject: [PATCH] Clean up svnmerge properties