From 7ee3d0cd4d5755d3d2709fae5ada9566164643e1 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Mon, 8 Jun 2009 14:51:44 +0000
Subject: [PATCH] [1.0.X] Block recent trunk revisions from merge

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