From 9e03bf2d47a3a6a8e743a385756b62908cab6b41 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Wed, 13 May 2009 16:05:23 +0000
Subject: [PATCH] [1.0.X] Blocked a few more changesets not applicable to the
 branch, and updated svnmerge-integrated to reflect changesets that have been
 merged.

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