From 743019f8fde33af4002b6bed4342edbd466172e7 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sat, 11 Oct 2008 14:21:36 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge.py metadata.

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