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

Conflicts:
	CVS/Entries.Log