Merge branch 'master' into jython

diff --cc wrw/wmako.py
index 86bc201,13ce342..92e3e65
--- 1/wrw/wmako.py
--- 2/wrw/wmako.py
+++ b/wrw/wmako.py
@@@ -1,7 -1,6 +1,7 @@@
 +from __future__ import with_statement
  import os, threading
  from mako import template, lookup, filters
- import util, form, session, env
+ import util, form, session, env, resp
  
  # It seems Mako isn't thread-safe.
  makolock = threading.Lock()