Merged in changes from the other main branch.
author<mako@atdot.cc> <>
Thu, 18 May 2006 16:51:57 +0000 (12:51 -0400)
committer<mako@atdot.cc> <>
Thu, 18 May 2006 16:51:57 +0000 (12:51 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?