From 59f0efa54b7905ba88f3c672689c9a92b8b16aad Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 25 Jul 2009 05:54:12 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties.

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