From c04a28df4c79d4912fd9d6d9683eba93f575d5cc Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 24 Mar 2009 12:34:41 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties for some recent trunk
 changesets

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