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
..
compilers	Merging from trunk.	2010-01-14 14:49:31 +00:00
eclipse	ECJ 3.5.1.	2009-11-05 14:36:45 +00:00
guile-modules	Add GNU guile-gnome.	2009-10-05 22:21:50 +00:00
interpreters	Merging from trunk.	2010-01-14 14:49:31 +00:00
libraries	Merging from trunk.	2010-01-14 14:49:31 +00:00
misc	removing old bleeding edge cruft replacing it by a niftier version using	2009-12-11 13:58:23 +00:00
perl-modules	Making perl DB_File follow the lib/perl5/site_perl convention for the *.pm files,	2009-10-15 22:08:23 +00:00
python-modules	Adding calibre. This involved also:	2010-01-07 22:47:30 +00:00
ruby-modules	Two Ruby modules	2008-10-05 09:00:56 +00:00
tools	Merging from trunk.	2010-01-14 14:49:31 +00:00