Lluís Batlle i Rossell e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=18472		2009-11-19 19:09:10 +00:00
..
darwin	pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin	2009-11-05 13:44:30 +00:00
linux	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00