From 9356e16a622a801cda872b6ae6ad86183547e724 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Thu, 18 Jun 2009 14:22:39 +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@11066 bcc190cf-cafb-0310-a4f2-bffc1f526a37