Index: /package_branches/invirt-web/cherrypy/code/view.py
===================================================================
--- /package_branches/invirt-web/cherrypy/code/view.py	(revision 2517)
+++ /package_branches/invirt-web/cherrypy/code/view.py	(revision 2518)
@@ -58,6 +58,5 @@
         cherrypy.request.handler = MakoHandler(t, cherrypy.request.handler, content_type)
 
-main = MakoLoader()
-cherrypy.tools.mako = cherrypy.Tool('on_start_resource', main)
+cherrypy.tools.mako = cherrypy.Tool('on_start_resource', MakoLoader())
 
 def revertStandardError():