From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 7 Dec 2011 08:18:42 +0000 (-0800)
Subject: Merge remote-tracking branch 'alekstorm/template_trace' into merge
X-Git-Tag: v2.2.0~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45ca697f5d18fad3fd26641b14422f54b236e0a8;p=thirdparty%2Ftornado.git

Merge remote-tracking branch 'alekstorm/template_trace' into merge

Conflicts:
	tornado/template.py
---

45ca697f5d18fad3fd26641b14422f54b236e0a8
diff --cc tornado/template.py
index fc9563016,5d8993ba2..fda7e5fdf
--- a/tornado/template.py
+++ b/tornado/template.py
@@@ -177,7 -177,8 +177,9 @@@ import loggin
  import os.path
  import posixpath
  import re
 +import threading
+ import sys
+ import traceback
  
  from tornado import escape
  from tornado.util import bytes_type