Peter Simons 1abdc56a12 Synchronized stdenv-updates branch with trunk.
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
2011-10-06 09:37:22 +00:00
..
2008-06-17 14:19:59 +00:00
2009-07-10 13:41:47 +00:00
2010-01-13 12:11:06 +00:00
2011-10-02 09:24:23 +00:00
2011-08-24 19:16:43 +00:00