Conflicts:
	gdk/gdkinput.h
	gdk/x11/gdkinput-x11.c
	gdk/x11/gdkinput-xfree.c
	gdk/x11/gdkinput.c
	gdk/x11/gdkwindow-x11.c
	gtk/gtkaboutdialog.c
	gtk/gtkmenushell.c
	gtk/gtkwidget.h