From 655b602020fcac23c3adf1298bb895f612144fcc Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 28 Apr 2009 14:33:31 +0000
Subject: [PATCH] Updated svnmerge properties for recent checkins

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