From f8738369891bdef86ce8067ccbdc053debffbfc2 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Tue, 21 Apr 2009 16:41:33 +0000
Subject: [PATCH] [1.0.X] Blocked a bunch of changesets related to new function
 from merge to branch.

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