Fix some weird merge issues.
Merge branch 'mark' of github.com:markjdb/freebsd into mark