From 53028294432b8abcccfa0ded70955dae4c6a3e8b Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 8 Jan 2010 18:47:15 +0100
Subject: [PATCH] Don't name a variable like the macro it's in, Jinja 2.1
 doesn't like it.

---
 sphinx/themes/basic/layout.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sphinx/themes/basic/layout.html b/sphinx/themes/basic/layout.html
index f489a656d..429cc9bb4 100644
--- a/sphinx/themes/basic/layout.html
+++ b/sphinx/themes/basic/layout.html
@@ -48,8 +48,8 @@
           {%- endblock %}
           {%- if sidebars %}
             {#- new style sidebar: explicitly include/exclude templates #}
-            {%- for sidebar in sidebars %}
-            {%- include sidebar %}
+            {%- for sidebartemplate in sidebars %}
+            {%- include sidebartemplate %}
             {%- endfor %}
           {%- else %}
             {#- old style sidebars: using blocks -- should be deprecated #}