merge in netbsd changes.