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-04-23 07:34:20 +00:00
2011-09-12 13:02:54 +00:00
2010-09-27 11:19:31 +00:00
2011-10-05 21:51:07 +00:00
2010-02-24 09:04:29 +00:00
2010-12-25 15:13:07 +00:00
2010-11-08 08:58:50 +00:00
2011-09-05 19:24:07 +00:00
2011-05-25 09:04:54 +00:00
2011-04-13 06:31:45 +00:00
2011-08-02 16:02:53 +00:00
2011-09-11 09:14:22 +00:00
2011-07-07 21:05:02 +00:00
2009-04-16 07:19:31 +00:00
2010-03-01 17:08:21 +00:00
2011-04-15 07:56:09 +00:00
2011-08-03 08:38:34 +00:00
2010-11-07 21:25:28 +00:00
2010-07-28 15:35:01 +00:00
2011-05-24 18:05:05 +00:00
2011-05-13 15:55:05 +00:00
2010-07-29 18:55:16 +00:00
2011-08-27 07:27:35 +00:00
2011-04-15 09:11:49 +00:00
2005-12-05 14:11:09 +00:00
2010-10-15 17:27:54 +00:00
2010-11-15 06:16:41 +00:00
2011-06-16 05:55:47 +00:00