From 6ab4b64bd04ea09d59c56ff9bb5384eaaafdadaa Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 10 Mar 2009 12:18:39 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties for some recent updates.

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