Merge branch 'master' into core-updates Conflicts: gnu/packages/make-bootstrap.scm
gnu: Add pango. * gnu/packages/gtk.scm (pango): New variable.
gnu: Add harfbuzz. * gnu/packages/gtk.scm (harfbuzz): New variable.
gnu: Add cairo. * gnu/packages/gtk.scm (cairo): New variable.
gnu: Add atk. * gnu/packages/gtk.scm: New module. * Makefile.am (MODULES): Add it.