Index: django/templatetags/i18n.py
===================================================================
--- django/templatetags/i18n.py	(revision 6098)
+++ django/templatetags/i18n.py	(working copy)
@@ -60,9 +60,12 @@
         return ''.join(result)
 
     def render(self, context):
-        context.push()
+        tmp_context = {}
         for var,val in self.extra_context.items():
-            context[var] = val.resolve(context)
+            tmp_context[var] = val.resolve(context)
+        # update works as a push, so corresponding context.pop() is
+        # at the end of function
+        context.update(tmp_context)
         singular = self.render_token_list(self.singular)
         if self.plural and self.countervar and self.counter:
             count = self.counter.resolve(context)