From aea426561af3e55f562234d70efb25517e4392f8 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Wed, 8 Oct 2008 14:15:39 +0000
Subject: [PATCH] [1.0.X] Blocked new feature r9188 from consideration by
 svnmerge.py.

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