am af975b07: am c843a3e7: Merge "Fix the qsort copyright notice (fixed upstream this afternoon)."

* commit 'af975b076f79b35cb115c0f77fc8fc0e5d3dba67':
  Fix the qsort copyright notice (fixed upstream this afternoon).