Index: django/contrib/contenttypes/generic.py
===================================================================
--- django/contrib/contenttypes/generic.py	(revision 9836)
+++ django/contrib/contenttypes/generic.py	(working copy)
@@ -307,7 +307,7 @@
         # Avoid a circular import.
         from django.contrib.contenttypes.models import ContentType
         if self.instance is None:
-            return self.model._default_manager.empty()
+            return self.model._default_manager.get_empty_query_set()
         return self.model._default_manager.filter(**{
             self.ct_field.name: ContentType.objects.get_for_model(self.instance),
             self.ct_fk_field.name: self.instance.pk,
Index: tests/modeltests/generic_relations/models.py
===================================================================
--- tests/modeltests/generic_relations/models.py	(revision 9836)
+++ tests/modeltests/generic_relations/models.py	(working copy)
@@ -219,6 +219,12 @@
 >>> from django.contrib.contenttypes.generic import generic_inlineformset_factory
 
 >>> GenericFormSet = generic_inlineformset_factory(TaggedItem, extra=1)
+>>> formset = GenericFormSet()
+>>> for form in formset.forms:
+...     print form.as_p()
+<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-tag">Tag:</label> <input id="id_generic_relations-taggeditem-content_type-object_id-0-tag" type="text" name="generic_relations-taggeditem-content_type-object_id-0-tag" maxlength="50" /></p>
+<p><label for="id_generic_relations-taggeditem-content_type-object_id-0-DELETE">Delete:</label> <input type="checkbox" name="generic_relations-taggeditem-content_type-object_id-0-DELETE" id="id_generic_relations-taggeditem-content_type-object_id-0-DELETE" /><input type="hidden" name="generic_relations-taggeditem-content_type-object_id-0-id" id="id_generic_relations-taggeditem-content_type-object_id-0-id" /></p>
+
 >>> formset = GenericFormSet(instance=Animal())
 >>> for form in formset.forms:
 ...     print form.as_p()