From cb73fe916eb241f486b1ec628a79356cbd323b0a Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 19 May 2009 15:05:22 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties for recent commits

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