[1.2.X] Fixed bug and test failure introducted in [14290]

Thanks Russell for alerting me.

Backport of [14294] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14295 bcc190cf-cafb-0310-a4f2-bffc1f526a37