From c03a0a7837a75aa135d0bad36fb9e01222292e48 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun, 3 May 2009 13:50:09 +0000
Subject: [PATCH] [1.0.X] Updated svnmerge and svn:ignore properties for recent
 checkins

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