Merge from jdong
authorJohn Dong <jdong@mit.edu>
Tue, 28 Aug 2007 16:27:38 +0000 (12:27 -0400)
committerJohn Dong <jdong@mit.edu>
Tue, 28 Aug 2007 16:27:38 +0000 (12:27 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?