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