am 60c7ac26: am d0f2b7e7: Merge "More upstream NetBSD upgrades."

* commit '60c7ac262241588f7942ca068f33d706c8fe5cc4':
  More upstream NetBSD upgrades.