From 2656e6bfa92f2b38bb5439454df424c2e5f49334 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 27 Feb 2009 13:27:11 +0000
Subject: [PATCH] [1.0.x] Updated SVN merge properties for some recent commits.

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