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
..
default.nix	Merging from trunk.	2010-04-22 21:44:33 +00:00