From 393e06997d45c3c927fecc81e83d23fc386d185b Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 17 Jul 2009 00:08:24 +0000
Subject: [PATCH] [1.0.X] Blocked recent revisions from merge

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