From f9249e4bd09752d5de735a44e9f01856da808cb1 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 29 Jul 2009 00:27:00 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties

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