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
..
gnupdate	gnupdate: Fix typo.	2010-07-04 21:11:31 +00:00
gnupdate.scm	gnupdate: Turn into a module.	2010-07-04 21:11:19 +00:00