From 0cac2cbc2f81d5713fb0023c690eac4a2d357b85 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Mon, 8 Mar 2010 20:53:51 +0000
Subject: [PATCH] [1.1.X] Updated svnmerge metadata to reflect changesets that
 have been and should not be merged.

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