Lluís Batlle i Rossell 9183f21f7e Merging from trunk. ... I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438		2010-01-14 14:49:31 +00:00
..
analysis
build-managers	Merging from trunk.	2010-01-14 14:49:31 +00:00
cdecl
documentation	Updating doxygen from 1.5.8 to 1.6.1	2009-11-04 14:58:39 +00:00
guile	G-Wrap 1.9.13.	2009-10-29 11:23:10 +00:00
haskell
java
literate-programming/noweb
misc	Merging from trunk.	2010-01-14 14:49:31 +00:00
ocaml/camlp5	Updated Coq to version 8.2pl1	2009-11-02 11:44:27 +00:00
parsing	The bison elf may call m4 (I saw that building binutils' gold).	2009-12-08 19:42:18 +00:00
profiling	* Improved a bunch of "name" attributes (mostly missing version	2009-10-28 14:06:56 +00:00
selenium/remote-control