[snowy: 26/26] Merge branch 'master-leonh' into openid-merge2

[Sanford Armstrong <sharm src gnome org>]

commit c2cb0c1637bd7e1387881e46b1bd7c46d8a5b16d
Merge: a0ae268 bf26706
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Wed Jun 16 07:43:05 2010 -0700

    Merge branch 'master-leonh' into openid-merge2
    
    Conflicts:
    	notes/templates/notes/base.html

 accounts/forms.py                                  |   35 ++-
 accounts/models.py                                 |   10 +
 accounts/templates/accounts/preferences.html       |   16 +
 accounts/templates/openid/login.html               |   68 +++
 accounts/templates/registration/login.html         |    2 +
 accounts/templates/registration/logout.html        |    2 +-
 .../templates/registration/registration_form.html  |   60 ++-
 accounts/urls.py                                   |   20 +-
 accounts/views.py                                  |   64 +++-
 lib/django_openid_auth/LICENSE.txt                 |   23 +
 lib/django_openid_auth/__init__.py                 |   29 ++
 lib/django_openid_auth/admin.py                    |   90 ++++
 lib/django_openid_auth/auth.py                     |  227 +++++++++
 lib/django_openid_auth/forms.py                    |   87 ++++
 lib/django_openid_auth/management/__init__.py      |   27 ++
 .../management/commands/__init__.py                |   27 ++
 .../management/commands/openid_cleanup.py          |   39 ++
 lib/django_openid_auth/models.py                   |   58 +++
 lib/django_openid_auth/store.py                    |  131 ++++++
 lib/django_openid_auth/teams.py                    |  411 +++++++++++++++++
 .../templates/openid/failure.html                  |   13 +
 lib/django_openid_auth/templates/openid/login.html |   44 ++
 lib/django_openid_auth/tests/__init__.py           |   37 ++
 lib/django_openid_auth/tests/test_store.py         |  193 ++++++++
 lib/django_openid_auth/tests/test_views.py         |  487 ++++++++++++++++++++
 lib/django_openid_auth/tests/urls.py               |   39 ++
 lib/django_openid_auth/urls.py                     |   36 ++
 lib/django_openid_auth/views.py                    |  255 ++++++++++
 lib/recaptcha_django/__init__.py                   |    5 +-
 settings.py                                        |   12 +
 site_media/css/accounts.css                        |   41 ++
 site_media/img/accounts/google-accounts-logo.png   |  Bin 0 -> 7774 bytes
 site_media/img/accounts/openid.png                 |  Bin 0 -> 3203 bytes
 templates/base.html                                |   18 +-
 urls.py                                            |    1 -
 35 files changed, 2565 insertions(+), 42 deletions(-)
---