Rolled back [2390] temporarily to test against some other edge cases
Rolled back [2390] temporarily to test against some other edge cases

git-svn-id: 4f9f921b081c523744c7bf24d959a0db39629563@2391 bcc190cf-cafb-0310-a4f2-bffc1f526a37

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