From 083a7206e471a8f67e7ba61b5b1085fd939547af Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 18 Mar 2009 12:38:39 +0000
Subject: [PATCH] [1.0.X] Corrected svnmerge-integrated property from r10086,
 updated to include some recent changes.

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