From: John Dong <jdong@mit.edu>
Date: Tue, 14 Aug 2007 20:54:00 +0000 (-0400)
Subject: Merge from my devel branch
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/3c50454cc2031d8996c099ef3a0ff510ffdc299c

Merge from my devel branch
---

3c50454cc2031d8996c099ef3a0ff510ffdc299c