From d78ff63ec69022b3dd2826cd1b4b687617b55cac Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 11 Apr 2009 15:13:31 +0000
Subject: [PATCH] Updated svnmerge properties for some recent changes

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