[1.0.X] Corrected svnmerge-integrated property from r10086, updated to include...

[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