x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
* Moved some of the Gnome package Nix expressions into
pkgs/desktops/gnome/default.nix - no need to have them in separate
files. This way the code is much shorter. Still to be done for all
the other Gnome packages.
* Glib 2.16.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11855