merged in changes from devel
author<mako@atdot.cc> <>
Fri, 31 Aug 2007 15:13:42 +0000 (11:13 -0400)
committer<mako@atdot.cc> <>
Fri, 31 Aug 2007 15:13:42 +0000 (11:13 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?