am cf4a5302: am b3c8c4d8: Merge "Switch to current FreeBSD qsort."

* commit 'cf4a53020d85b0017799c31dc41823f9e775a1c5':
  Switch to current FreeBSD qsort.