merged more fixes from devel
author<mako@atdot.cc> <>
Sat, 27 Dec 2008 12:55:15 +0000 (07:55 -0500)
committer<mako@atdot.cc> <>
Sat, 27 Dec 2008 12:55:15 +0000 (07:55 -0500)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?