Merge from head
authorJohn Dong <jdong@mit.edu>
Thu, 30 Aug 2007 15:20:52 +0000 (11:20 -0400)
committerJohn Dong <jdong@mit.edu>
Thu, 30 Aug 2007 15:20:52 +0000 (11:20 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?