From 3c222b1b8be7c04578e50a66578b3a31a8ce70f5 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Thu, 30 Apr 2009 15:44:05 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10649 bcc190cf-cafb-0310-a4f2-bffc1f526a37