Backport [7521] to 0.96-bugfixes per security policy; announcement and security bugfix release will be forthcoming.

      git-svn-id: http://code.djangoproject.com/svn/django/branches/0.96-bugfixes@7527 bcc190cf-cafb-0310-a4f2-bffc1f526a37