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.
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: 4f9f921b081c523744c7bf24d959a0db39629563@7629 bcc190cf-cafb-0310-a4f2-bffc1f526a37

dcramer/django-compositepks,disqus/django-old,Smarsh/django,skevy/django,bfirsh/django-old,jamespacileo/django-france,hugs/django,dcramer/django-compositepks,bfirsh/django-old,skevy/django,mitsuhiko/django,skevy/django,hugs/django,alex/django-old,Smarsh/django,dcramer/django-compositepks,t11e/django,Instagram/django,django-nonrel/django-nonrel,t11e/django,sam-tsai/django-old,jamespacileo/django-france,sam-tsai/django-old,Instagram/django,Smarsh/django,django-nonrel/django-nonrel,jamespacileo/django-france,alex/django-old,mitsuhiko/django,disqus/django-old,django-nonrel/django-nonrel,mitsuhiko/django,Instagram/django,alex/django-old,Smarsh/django,t11e/django,sam-tsai/django-old,hugs/django,bfirsh/django-old,disqus/django-old,sam-tsai/django-old