Fixes CVE-2012-0862.
svn path=/nixpkgs/trunk/; revision=30865
svn path=/nixpkgs/trunk/; revision=16779