From c5bc8932484c68ee63d247b4cc5412ef5c21fd0f Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 2 May 2009 07:46:37 +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@10658 bcc190cf-cafb-0310-a4f2-bffc1f526a37