From 5adf72e3ad92c724791adc78322b08d8468fe438 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sun, 16 Nov 2008 19:04:51 +0000
Subject: [PATCH] [1.0.X] Block trunk feature/enhancement work from svnmerge to
 branch.

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