Merge branch 'master' into python3

diff --cc wrw/resp.py
Simple merge

diff --cc wrw/sp/xhtml.py
index 17c5678,d19fc99..52e7f9f
--- 1/wrw/sp/xhtml.py
--- 2/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@@ -51,9 -51,11 +51,11 @@@ class htmlindenter(util.indenter, htmlf
  def forreq(req, tree):
      # XXX: Use proper Content-Type for clients accepting it.
      req.ohead["Content-Type"] = "text/html; charset=utf-8"
 -    buf = StringIO.StringIO()
 +    buf = io.BytesIO()
      htmlindenter.output(buf, tree, doctype=(doctype, dtd), charset="utf-8")
-     return [buf.getvalue()]
+     ret = buf.getvalue()
+     req.ohead["Content-Length"] = len(ret)
+     return [ret]
  
  def xhtmlresp(callable):
      def wrapper(req):