From: John Dong <jdong@mit.edu>
Date: Wed, 29 Aug 2007 15:28:47 +0000 (-0400)
Subject: Merge trunk
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/3f5f14d1c73ff2614b0012d027e7360583e1a70e?hp=--cc

Merge trunk
---

3f5f14d1c73ff2614b0012d027e7360583e1a70e