Index: H:/Programming/Python/Python24/Lib/site-packages/django/views/generic/list_detail.py
===================================================================
--- H:/Programming/Python/Python24/Lib/site-packages/django/views/generic/list_detail.py	(revision 2365)
+++ H:/Programming/Python/Python24/Lib/site-packages/django/views/generic/list_detail.py	(working copy)
@@ -6,7 +6,7 @@
 
 def object_list(request, queryset, paginate_by=None, allow_empty=False,
         template_name=None, template_loader=loader,
-        extra_context={}, context_processors=None):
+        extra_context={}, context_processors=None, template_model_name='object'):
     """
     Generic list of objects.
 
@@ -47,7 +47,7 @@
                 raise Http404
         page = int(page)
         c = RequestContext(request, {
-            'object_list': object_list,
+            '%(template_model_name)s_list' % {'template_model_name': template_model_name}: object_list,
             'is_paginated': paginator.pages > 1,
             'results_per_page': paginate_by,
             'has_next': paginator.has_next_page(page),
@@ -60,7 +60,7 @@
         }, context_processors)
     else:
         c = RequestContext(request, {
-            'object_list': queryset,
+            '%(template_model_name)s_list' % {'template_model_name': template_model_name}: queryset,
             'is_paginated': False
         }, context_processors)
         if not allow_empty and len(queryset) == 0:
@@ -78,7 +78,7 @@
 def object_detail(request, queryset, object_id=None, slug=None,
         slug_field=None, template_name=None, template_name_field=None,
         template_loader=loader, extra_context={},
-        context_processors=None):
+        context_processors=None, template_model_name='object'):
     """
     Generic list of objects.
 
@@ -106,7 +106,7 @@
     else:
         t = template_loader.get_template(template_name)
     c = RequestContext(request, {
-        'object': object,
+        template_model_name: object,
     }, context_processors)
     for key, value in extra_context.items():
         if callable(value):