From c4f1970b03ab7d5267dda28977ce0696b3e6ab45 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 11 Jul 2009 16:11:50 +0000
Subject: [PATCH] [1.0.X] Blocked r11221 from merge.

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