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

pkgs/build-support/kernel/modules-closure.sh

@@ -18,7 +18,10 @@ for module in $rootModules; do
         | sed 's/^insmod //') \
         || if test -z "$allowMissing"; then exit 1; fi
     #for i in $deps; do echo $i; done
-    closure="$closure $deps"
+    if [[ "$deps" != builtin* ]]
+    then
+        closure="$closure $deps"
+    fi
 done
 
 echo "closure:"