Merge branch 'netbsd-autoconf'