This merge leads to a big rebuild, but this wouldn't hurt as I'm going to reintegrate this branch soon. svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455