From 5acc58360d8eee377d7c1d4c3d80ab28bc541633 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Thu, 16 Apr 2009 15:02:33 +0000
Subject: [PATCH] Updated svnmerge properties for 1.0.X branch

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