merge FreeBSD stuff
11 files changed