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
..
apache-ant	ant version 1.8.0RC1	2010-01-13 15:20:24 +00:00
buildbot	BuildBot: Fix erroneous absolute paths.	2010-01-13 21:34:50 +00:00
cmake	Merging from trunk.	2009-12-12 18:39:09 +00:00
gnumake
gnumake-3.80
mk
remake
scons