NetBSD cvs for git rev fb6b9f196090768b2d606f856f4c09e14d019063
Merge branch 'netbsd-cvs'