From: John Dong <jdong@mit.edu>
Date: Wed, 15 Aug 2007 19:54:13 +0000 (-0400)
Subject: Merge from head
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/343bc338d381da77f55b0231316c237c7502cbc2

Merge from head
---

343bc338d381da77f55b0231316c237c7502cbc2