merge netbsd modifications