am 8d6302cd: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."

* commit '8d6302cdcff9c53fe3ecd36ab479fdf08318c504':
  Our strcoll(3) is no different from NetBSD's, so take exactly theirs.