Resolved conflict

--HG--
branch : trunk

diff --cc jinja2/debug.py
Simple merge

diff --cc jinja2/environment.py
index 09705c13e19fb8d5d370d35ae0fb7f3542e74cf9,f163ab57671e75051e340c8b6bad017a046be2e1..9b3193aa9493695d8dce1feffd25c376186cad3a
--- 1/jinja2/environment.py
--- 2/jinja2/environment.py
+++ b/jinja2/environment.py
@@@ -482,9 -476,16 +483,14 @@@ class Environment(object)
          global _make_traceback
          if exc_info is None:
              exc_info = sys.exc_info()
+ 
+         # the debugging module is imported when it's used for the first time.
+         # we're doing a lot of stuff there and for applications that do not
+         # get any exceptions in template rendering there is no need to load
+         # all of that.
          if _make_traceback is None:
              from jinja2.debug import make_traceback as _make_traceback
 -
          traceback = _make_traceback(exc_info, source_hint)
 -
          if rendered and self.exception_formatter is not None:
              return self.exception_formatter(traceback)
          if self.exception_handler is not None: