Merge of r11275 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Merge of r11275 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11279 bcc190cf-cafb-0310-a4f2-bffc1f526a37