From c7117b103a5a2ae50903faf2197ebafb6cd3687a Mon Sep 17 00:00:00 2001
From: Joseph Kocherhans <joseph@jkocherhans.com>
Date: Tue, 23 Feb 2010 15:27:36 +0000
Subject: [PATCH] [1.1.X] Blocked a couple of revisions that shouldn't be
 merged.

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