Lluís Batlle i Rossell 5417c720fd Merging from trunk. ... I tried to fix some trivial conflicts. I don't know if I merged well some more difficult conflicts on openssl/darwin_patch or haskell-platform. svn path=/nixpkgs/branches/stdenv-updates/; revision=22878		2010-08-02 15:48:19 +00:00
..
2.4.nix
2.6.18.5.nix
2.6.28.nix
2.6.32.nix	Merging from trunk.	2010-08-02 15:48:19 +00:00
builder.sh
unifdef-getline.patch