From a263d3b445072a78e140a9b5d75f793532a13ee1 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Mon, 3 May 2010 18:09:48 +0000
Subject: [PATCH] [1.1.X] Updated svnmerge metadata.

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