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

Trivial merge

Benjamin Mako Hill || Want to submit a patch?