From e7555c09d834a971bfdfa50eb263db6d5288211b Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 2 May 2009 15:00:01 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties for recent changes

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