git-svn-id: http://code.djangoproject.com/svn/django/trunk@13717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Thanks to pmd for report, zhaoz, mmalone and justinlilly for patch git-svn-id: http://code.djangoproject.com/svn/django/trunk@11914 bcc190cf-cafb-0310-a4f2-bffc1f526a37