From: Evan Broder <broder@mit.edu>
Date: Mon, 21 Dec 2009 04:27:10 +0000 (-0500)
Subject: Merge cherrypy-rebased branch of invirt-web into trunk.
X-Git-Tag: 0.1.0^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/a657eaa1d5a78de84fbd8cf4d40c189269fb901f?hp=-c

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

svn path=/trunk/packages/invirt-web/; revision=2737
---

a657eaa1d5a78de84fbd8cf4d40c189269fb901f