NetBSD cvs for git rev 609b84eeeb9c22a9eecbb994df5d71837de987c7
Merge branch 'netbsd-cvs'