From 0b52750887b48c038477fc80606614b4ed4a1e2c Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sun, 17 Jan 2010 20:26:02 +0000
Subject: [PATCH] [1.1.X] Update svnmerge metadata to relfect things that have
 been and should not be merged.

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