merged fixes from devel
authorroot <root@epicenter>
Sat, 27 Dec 2008 12:54:39 +0000 (07:54 -0500)
committerroot <root@epicenter>
Sat, 27 Dec 2008 12:54:39 +0000 (07:54 -0500)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?