am 07fde26d: DO NOT MERGE Fix for CVE-2011-3026

* commit '07fde26d99f1da11fc514b2aeef7ae0620f85a63':
  DO NOT MERGE Fix for CVE-2011-3026