From fc15d690b1c33a3ead51bf420db1d67e9045e631 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 5 May 2009 22:31:15 +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@10679 bcc190cf-cafb-0310-a4f2-bffc1f526a37