From: John Dong <jdong@mit.edu>
Date: Fri, 17 Aug 2007 22:00:31 +0000 (-0400)
Subject: Merge from jdong; all testcases should succeed at this point, and all deprecations... 
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/1620856a8a47219f3a2cbb5288137b11467886fc?hp=41db8c20bfa6518cacaf6b3f816fb071fc486374

Merge from jdong; all testcases should succeed at this point, and all deprecations should be gone
---