diff options
* Merged most of the stdenv-updates branch. Some stuff didn't
merge cleanly right away (kde-4, kernel stuff) so it should be merged later. But the stdenv stuff is all there. svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793