From 10e90f9350bb5a99ee1ac1a642d37d3d7585056d Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 24 Jul 2009 14:11:09 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge properties

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