NetBSD cvs for git rev 1b6357eb0103c4af6f699266fa244a0b18860c86
Merge branch 'netbsd-cvs'