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
..
2011-02-22 13:39:56 +00:00
2010-08-19 14:33:44 +00:00
2006-09-11 13:37:46 +00:00
2011-09-27 11:06:41 +00:00
2011-09-30 17:26:38 +00:00
2010-08-07 20:14:04 +00:00
2011-10-03 18:40:12 +00:00
2011-10-02 21:15:36 +00:00