r10835 from trunk. Also updated svnmerge metadata for some other recent commits. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
r10835 from trunk. Also updated svnmerge metadata for some other recent commits. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10836 bcc190cf-cafb-0310-a4f2-bffc1f526a37