Merge from head
authorJohn Dong <jdong@mit.edu>
Wed, 15 Aug 2007 19:54:13 +0000 (15:54 -0400)
committerJohn Dong <jdong@mit.edu>
Wed, 15 Aug 2007 19:54:13 +0000 (15:54 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?