From 86c278f2a53bf37e5d3b6f0cc20a69b759b321c4 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Wed, 13 May 2009 19:14:02 +0000
Subject: [PATCH] [1.0.X] Blocked a few more changesets and added a couple more
 that have been integrated.

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