sync with security wheezy/updates, fixes CVE-2014-7169
Merge pull request #7 from proppy/master

sync with security wheezy/updates, fixes CVE-2014-7169