Merged changes from jdong's branch into HEAD.
author<mako@atdot.cc> <>
Fri, 17 Aug 2007 20:49:15 +0000 (16:49 -0400)
committer<mako@atdot.cc> <>
Fri, 17 Aug 2007 20:49:15 +0000 (16:49 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?