Merge from jdong
authorJohn Dong <jdong@mit.edu>
Wed, 29 Aug 2007 15:29:49 +0000 (11:29 -0400)
committerJohn Dong <jdong@mit.edu>
Wed, 29 Aug 2007 15:29:49 +0000 (11:29 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?