Revised [12376] with the benefit of coffee. Thanks to Alex Gaynor for paying...

Revised [12376] with the benefit of coffee. Thanks to Alex Gaynor for paying attention to every commit I make :-)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12377 bcc190cf-cafb-0310-a4f2-bffc1f526a37