From a6db5f229b59fbfa191f93fc183d5b0394d30062 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 6 Jun 2009 08:36:13 +0000
Subject: [PATCH] [1.0.X] Blocked update from merge to branch

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