magic-removal: updated (most) dependencies to reflect new location of django.models.core Package and ContentType.

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1887 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/db/models/options.py

@@ -98,7 +98,7 @@ class Options:
     def get_content_type_id(self):
         "Returns the content-type ID for this object type."
         if not hasattr(self, '_content_type_id'):
-            from django.models.core import ContentType
+            from django.contrib.contenttypes.models import ContentType
             self._content_type_id = ContentType.objects.get_object(
                 python_module_name__exact=self.module_name,
                 package__label__exact=self.app_label).id