From d4a2d1f47c578ff3e0bdb2e5c38de5e1f86721e6 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Mon, 18 Jan 2010 00:00:31 +0000
Subject: [PATCH] [1.1.X] Updated svnmerge metadata to reflect more stuff that
 has been and should not be applied to 1.1.X.

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