Merging from trunk.

I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912

pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch

@@ -3,6 +3,17 @@ compiling with `-O0' (as is done with coverage analysis) since there may
 be many false references held on the stack, leading to the failure of
 such tests.
 
+--- a/test-suite/tests/gc.test
++++ b/test-suite/tests/gc.test
+@@ -59,6 +59,7 @@
+ 
+ (with-test-prefix "gc"
+   (pass-if "Unused modules are removed"
++           (throw 'unresolved)
+ 	   (let* ((guard (make-guardian))
+                   (total 1000))
+ 
+
 --- a/test-suite/tests/threads.test
 +++ b/test-suite/tests/threads.test
 @@ -366,6 +366,7 @@