NetBSD cvs for buildrump.sh git rev 17651
Merge branch 'netbsd-cvs'