Conflicts:
	gladeui/Makefile.am
	gladeui/glade-app.c
	gladeui/glade-app.h
	gladeui/glade-editor.c
	gladeui/glade-signal-editor.c
	gladeui/glade-signal-editor.h
	gladeui/glade-signal.h
	gladeui/glade-widget.c
	gladeui/glade-widget.h