From cde397df318444b405d7ad55f4c64d332f1225ae Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 9 May 2009 05:31:19 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties for recent checkins

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