  from django.db.models.base import ModelBase
  from django.core.exceptions import ImproperlyConfigured
  from django.core.urlresolvers import reverse
  from django.template.response import TemplateResponse
  from django.utils.functional import update_wrapper
  from django.utils.safestring import mark_safe
  from django.utils.text import capfirst
  from django.utils.translation import ugettext as _
  from django.views.decorators.cache import never_cache
  from django.conf import settings
 
</s> remove from django import http, template
 </s> add from django import http </s> remove import re
 </s> add 
  from django.db.models.base import ModelBase
  from django.core.exceptions import ImproperlyConfigured
  from django.core.urlresolvers import reverse
  from django.template.response import TemplateResponse

  from django.utils.safestring import mark_safe
  from django.utils.text import capfirst
  from django.utils.translation import ugettext as _
  from django.views.decorators.cache import never_cache
  from django.conf import settings
keep keep keep keep replace keep keep keep keep keep
 Cleaned up admin sites.py imports.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16134 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/contrib/admin/sites.py