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