Some NetBSD merge changes I have had lying around for quite a while
Some NetBSD merge changes I have had lying around for quite a while

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars