From 7560497a50d4d9753ec1694d80b5d8dcd7873df4 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 6 Jun 2009 13:39:13 +0000
Subject: [PATCH] [1.0.X] Blocked recent trunk updates from merge to branch

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