Backport of r13548 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Bakport of [13419] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Also fixed #10291, which was related, and cleaned up some inconsistent doc labels. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12229 bcc190cf-cafb-0310-a4f2-bffc1f526a37