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	Merging from trunk.	2010-08-02 15:48:19 +00:00
phonon-4.4.0.patch	qt-4.7.0-beta2: fool phonon version	2010-07-31 13:05:46 +00:00