Tweaked some changes from [16283] to fix failures in i18n and defaultfilters regression tests.
Tweaked some changes from [16283] to fix failures in i18n and defaultfilters regression tests.

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

disqus/django-old,mitsuhiko/django,disqus/django-old,mitsuhiko/django,disqus/django-old,mitsuhiko/django