Merge lp://staging/~bigkevmcd/django-openid-auth/fix-bug-897651 into lp://staging/~django-openid-auth/django-openid-auth/trunk

Looks good, although the copyright date in the new file should be updated.

> Looks good, although the copyright date in the new file should be updated.

I've fixed it to be 2012...is there a plan to generally update all files?

Yeah. I guess all files should be updated for the next release.

I just tried merging this, and received the following errors:

======================================================================
FAIL: test_admin_site_with_openid_login_authenticated_non_staff (django_openid_auth.tests.test_admin.SiteAdminTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/james/src/ubunet/django-openid-auth/django_openid_auth/tests/test_admin.py", line 74, in test_admin_site_with_openid_login_authenticated_non_staff
    response.content, 'Missing error message in response')
AssertionError: False is not True : Missing error message in response

======================================================================
FAIL: test_admin_site_with_openid_login_non_authenticated_user (django_openid_auth.tests.test_admin.SiteAdminTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/james/src/ubunet/django-openid-auth/django_openid_auth/tests/test_admin.py", line 82, in test_admin_site_with_openid_login_non_authenticated_user
    self.assertEqual(302, response.status_code)
AssertionError: 302 != 200

----------------------------------------------------------------------

Looking at the tests, the problem is that the behaviour being tested reads the settings variable at import time, and while the test is probably updating the setting after django_openid_auth.admin has already been imported by the django.contrib.admin code.