am 9b3bbcda: am fe43c768: Merge "Switch to the current NetBSD regex implementation."

* commit '9b3bbcda8478a31fa2c3865e0bd8cb3011dfc26e':
  Switch to the current NetBSD regex implementation.