Conflicts:
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	setup_native/prj/build.lst
	setup_native/prj/d.lst
	wizards/Jar_query.mk
	wizards/Module_wizards.mk
	wizards/Zip_launcher.mk
	wizards/com/sun/star/wizards/report/makefile.mk
	wizards/prj/build.lst
	wizards/prj/d.lst
	wizards/util/target.pmk