Big rebuild (though not stdenv-update). Security update, do not revert, please. svn path=/nixpkgs/trunk/; revision=21352
svn path=/nixpkgs/trunk/; revision=18773
svn path=/nixpkgs/trunk/; revision=16097