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
..
default.nix	Upgrade rekonq	2010-07-31 13:06:10 +00:00
source.nix	Upgrade rekonq	2010-07-31 13:06:10 +00:00