Merge from jdong; all testcases should succeed at this point, and all deprecations...
authorJohn Dong <jdong@mit.edu>
Fri, 17 Aug 2007 22:00:31 +0000 (18:00 -0400)
committerJohn Dong <jdong@mit.edu>
Fri, 17 Aug 2007 22:00:31 +0000 (18:00 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?