fix a merge mistake by yours truly.
fix a merge mistake by yours truly.

hnakamur/django-admin2,andrewsmedina/django-admin2,yarbelk/django-admin2,yarbelk/django-admin2,pydanny/django-admin2,andrewsmedina/django-admin2,pydanny/django-admin2,andrewsmedina/django-admin2,hnakamur/django-admin2