Merge from head
authorJohn Dong <jdong@mit.edu>
Fri, 31 Aug 2007 13:35:09 +0000 (09:35 -0400)
committerJohn Dong <jdong@mit.edu>
Fri, 31 Aug 2007 13:35:09 +0000 (09:35 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?