merge with netbsd (no external differences... basically just makes diffs easier)
merge with netbsd (no external differences... basically just makes diffs easier)

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