From 98b1b0794c2783bd7aae8630368556f0758fa1e5 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Tue, 28 Oct 2008 16:25:42 +0000
Subject: [PATCH] [1.0.X] blocked commit related to new feature from
 svnmerge.py consideration.

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