From cf844fde9f1c5051b96bdd8ce58a0aa773926f0b Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sat, 12 Dec 2009 13:07:13 +0000
Subject: [PATCH] [1.1.X] Update svnmerge metadata to reflect what has been
 backported and what should not be backported to 1.1.X.

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