Merge jdong; mostly functional testing work
authorJohn Dong <jdong@mit.edu>
Mon, 20 Aug 2007 20:10:48 +0000 (16:10 -0400)
committerJohn Dong <jdong@mit.edu>
Mon, 20 Aug 2007 20:10:48 +0000 (16:10 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?