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
..
audio	* Fix some more "args: with args".	2010-07-30 14:47:23 +00:00
display-managers/slim	Fixing the slim build in gcc 4.4	2010-01-16 15:02:46 +00:00
editors	Merging from trunk.	2010-08-02 15:48:19 +00:00
graphics	* ltrace: updated to 0.5.3.	2010-07-29 18:55:16 +00:00
misc	Merging from trunk.	2010-08-02 15:48:19 +00:00
networking	Merging from trunk.	2010-08-02 15:48:19 +00:00
office	* More cleanup.	2010-07-28 18:01:17 +00:00
science	* More cleanup.	2010-07-28 18:01:17 +00:00
taxes	* aangifte2009 requires xdg-utils to open a browser.	2010-03-25 20:39:01 +00:00
version-management	Merging from trunk.	2010-08-02 15:48:19 +00:00
video	* More cleanup.	2010-07-28 18:01:17 +00:00
virtualization	* ltrace: updated to 0.5.3.	2010-07-29 18:55:16 +00:00
window-managers	* ltrace: updated to 0.5.3.	2010-07-29 18:55:16 +00:00