Merged OpenBSD CVS changes that go away
13 files changed