From 9133e12a4cb0bc075d176eba16b3efaf395f6e91 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 13 Jul 2009 14:01:04 +0000
Subject: [PATCH] [1.0.X] Update svnmerge properties for recent changes

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