Fixed #7436 -- Corrected a fix from [7615] that broke some test cases. Don't...

Fixed #7436 -- Corrected a fix from [7615] that broke some test cases. Don't you just love unintended consequences? Thanks to telenieko for the report, and the buildbot for pointing out my mistake.

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