merged in some more fixes fromdevel
author<mako@atdot.cc> <>
Wed, 5 Sep 2007 15:47:04 +0000 (11:47 -0400)
committer<mako@atdot.cc> <>
Wed, 5 Sep 2007 15:47:04 +0000 (11:47 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?