svn path=/nixpkgs/branches/stdenv-updates/; revision=24663
* Also a bunch of style cleanups (tabs, with args, ...). svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823