am 60fd9a36: (-s ours) DO NOT MERGE Fix for CVE-2011-3919

* commit '60fd9a3698956b22cb34a7553cf38cf679f473a6':
  DO NOT MERGE Fix for CVE-2011-3919