svn path=/nixpkgs/branches/stdenv-updates/; revision=14976
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823