Fixes CVE-2012-1151.
svn path=/nixpkgs/trunk/; revision=28689
svn path=/nixpkgs/trunk/; revision=15350