merge heads and resolve conflicts

CHANGES

@@ -18,6 +18,8 @@ Bugs fixed
 
 * Restore ``versionmodified`` CSS class for versionadded/changed and deprecated
   directives.
+* Fix: `html_theme_path=['.']` is a trigger of rebuild all documents always
+  (This change keeps the current "theme changes cause a rebuild" feature).
 
 
 Release 1.2 beta3 (released Oct 3, 2013)

sphinx/jinja2glue.py

@@ -91,25 +91,25 @@ class BuiltinTemplateLoader(TemplateBridge, BaseLoader):
         # create a chain of paths to search
         if theme:
             # the theme's own dir and its bases' dirs
-            chain = theme.get_dirchain()
+            pathchain = theme.get_dirchain()
             # then the theme parent paths
-            chain.extend(theme.themepath)
+            loaderchain = pathchain + theme.themepath
         elif dirs:
-            chain = list(dirs)
+            pathchain = loaderchain = list(dirs)
         else:
-            chain = []
+            pathchain = loaderchain = []
 
         # prepend explicit template paths
         self.templatepathlen = len(builder.config.templates_path)
         if builder.config.templates_path:
-            chain[0:0] = [path.join(builder.confdir, tp)
-                          for tp in builder.config.templates_path]
+            pathchain[0:0] = [path.join(builder.confdir, tp)
+                              for tp in builder.config.templates_path]
 
         # store it for use in newest_template_mtime
-        self.pathchain = chain
+        self.pathchain = pathchain
 
         # make the paths into loaders
-        self.loaders = map(SphinxFileSystemLoader, chain)
+        self.loaders = map(SphinxFileSystemLoader, loaderchain)
 
         use_i18n = builder.app.translator is not None
         extensions = use_i18n and ['jinja2.ext.i18n'] or []