Merge cherrypy-rebased branch of invirt-web into trunk.