From 0a4890466c0f262970536014a983035aea1d4cdb Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 9 Jun 2009 14:04:27 +0000
Subject: [PATCH] [1.0.X] Blocked recent updates from merge.

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