Conflicts:
	Makefile.in
	configure.in
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	set_soenv.in
	solenv/inc/minor.mk