merged in changes from devel
author<mako@atdot.cc> <>
Wed, 5 Sep 2007 12:55:50 +0000 (08:55 -0400)
committer<mako@atdot.cc> <>
Wed, 5 Sep 2007 12:55:50 +0000 (08:55 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?