From 3cd3df814da9227bd6f4d3a68271d04fd1e94c33 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Tue, 19 May 2009 23:39:35 +0000
Subject: [PATCH] [1.0.X] Blocked r10826 from merge to branch as it's a fix to
 code added in a blocked changeset.  Also replaced r10824 with r10822 in
 svnmerge-integrated as I believe that was the intent of r10825.

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