Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=24429		2010-10-23 14:52:21 +00:00
..
default.nix	Merging from trunk. I resolved some conflicts; I hope that well.	2010-10-23 14:52:21 +00:00