[multi-db] Merge trunk to [3578]

git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3581 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 1 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index a9823e5c4c..1d5c5a0cda 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@ setup(
         '': ['*.TXT'],
         'django.conf': ['locale/*/LC_MESSAGES/*'],
         'django.contrib.admin': ['templates/admin/*.html',
+                                 'templates/admin/auth/user/*.html',
                                  'templates/admin_doc/*.html',
                                  'templates/registration/*.html',
                                  'templates/widget/*.html',