Merge in fixes for OpenBSD.
authorBrian Aker <brian@gaz>
Mon, 26 Jul 2010 19:16:36 +0000 (12:16 -0700)
committerBrian Aker <brian@gaz>
Mon, 26 Jul 2010 19:16:36 +0000 (12:16 -0700)

Trivial merge