From e21c85c58e2d7963fb141988fd7a918bf15e62ca Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 16 May 2009 06:30:12 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties for recent commits

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