From e94ef54279227bcbc994e22c0c1b2e8a83309d45 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 28 Jul 2009 15:11:55 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties

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