From 940b8a17d44986420b4908c640b271090db98f9d Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 15 Jul 2009 14:28:08 +0000
Subject: [PATCH] [1.0.X] Blocked some recent updates from merge

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