[1.0.X] Blocked r10621 from merge to branch, and updated svnmerge-integrated...

[1.0.X] Blocked r10621 from merge to branch, and updated svnmerge-integrated to reflect all changesets that have been merged.


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