stdenv-updates branch). svn path=/nixpkgs/trunk/; revision=9652
svn path=/nixpkgs/trunk/; revision=9645
svn path=/nixpkgs/trunk/; revision=9077