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