[dev] Some diverse patches

[Chuck Hagenbuch]

Quoting Rick Emery <rick at emery.homelinux.net>:

> Ordinarily, I would have sent seperate messages for each patch (they don't
> relate to each other). However, they're so small with such minor changes, I
> just wrapped them into one message.

All now committed.

-chuck

--
Charles Hagenbuch, <chuck at horde.org>
"I'm really... I'm not too fascinated by green food." - Average Joe