From 88ec9d97cbb7c693a8ee144fa99b85fb2075a7c6 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Mon, 26 Oct 2009 15:15:17 +0000
Subject: [PATCH] [1.1.X] Block new features and fixes from svnmerge to 1.1.X
 branch.

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