From 7dd0abc113bc131ba037e83275e3bd9530b68903 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Wed, 14 Jan 2009 16:02:59 +0000
Subject: [PATCH] [1.0.X] Bring svnmerge metadata up to date with what's
 actually been merged to the branch.

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