b15b1c08b5
Favored NetBSD upon conflicts, except for a typo and consistency. ok riz@
Favored NetBSD upon conflicts, except for a typo and consistency. ok riz@