From cef2a6f236ecf1d18b802823d24ddb80feb40562 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Thu, 25 Jun 2009 05:36:29 +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@11105 bcc190cf-cafb-0310-a4f2-bffc1f526a37