From 1b6fac19ce0c547dd7c5051d430cf27a8e1186a5 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 11 May 2009 00:06:03 +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@10734 bcc190cf-cafb-0310-a4f2-bffc1f526a37