Merge branch 'Gtk' into Gtk-Screen.

diff --cc src/TAGS
index 18815ae6d746ed3aa228a2b0121b73b66caeea8a,e0668593b9f1c08e4c01a0e000c0644f769bdb34..bc04cc88373f128be285385ddfb1e49e8584419c
--- 1/src/TAGS
--- 2/src/TAGS
+++ b/src/TAGS
@@@ -15,6 -15,4 +15,9 @@@ cref/TAGS,includ
  \f
  rcs/TAGS,include
  \f
++<<<<<<< HEAD
 +imail/TAGS,include
 +\f
++=======
++>>>>>>> e15962eff9573c3e57401773ef469d514789414e
  ffi/TAGS,include