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

Trivial merge

Benjamin Mako Hill || Want to submit a patch?