Lluís Batlle i Rossell 6f2fac6466 Merging from trunk. ... I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251		2010-04-22 21:44:33 +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.	2010-04-22 21:44:33 +00:00