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
..
2005-12-05 14:11:09 +00:00
2009-11-08 22:30:38 +00:00
2008-07-06 15:46:10 +00:00
2009-12-25 19:20:38 +00:00
2005-12-05 14:11:09 +00:00