Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=25188		2010-12-17 20:39:58 +00:00
..
default.nix	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00