Merge from my devel branch
authorJohn Dong <jdong@mit.edu>
Tue, 14 Aug 2007 20:54:00 +0000 (16:54 -0400)
committerJohn Dong <jdong@mit.edu>
Tue, 14 Aug 2007 20:54:00 +0000 (16:54 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?