Merge branch 'master' of git://github.com/pinax/django-user-accounts into south
Merge branch 'master' of git://github.com/pinax/django-user-accounts into django-1.5

Conflicts:
	account/views.py
Merge branch 'django-1.5'
Merge branch 'south'