through the stdenv-updates merge (probably because they had been modified in the branch). svn path=/nixpkgs/trunk/; revision=15403
through the stdenv-updates merge (probably because they had been modified in the branch). svn path=/nixpkgs/trunk/; revision=15403