From 4771790c68ac3902b9d7c15741a06f593274d7c6 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Mon, 12 Apr 2010 17:00:07 +0000
Subject: [PATCH] [1.1.X] svnmerge.py metatdata housekeeping.

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