From f538e15a2cab8d2ddd2b5c6153019c31ecd6ee4d Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 3 Jul 2009 03:27:31 +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@11161 bcc190cf-cafb-0310-a4f2-bffc1f526a37