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	phonon-4.4.2	2010-06-21 19:25:20 +00:00
phonon-4.4.1-gst-plugins-include.patch	phonon-4.4.2	2010-06-21 19:25:20 +00:00