Conflicts:
	svtools/source/filter/wmf/winmtf.hxx
	tools/source/fsys/urlobj.cxx
	unotools/source/config/configmgr.cxx
	unotools/source/config/makefile.mk
	vcl/inc/vcl/cursor.hxx
	vcl/source/gdi/outdevnative.cxx
	vcl/source/window/abstdlg.cxx
	vcl/source/window/toolbox.cxx
	vcl/unx/generic/printer/ppdparser.cxx
	vcl/unx/generic/printer/printerinfomanager.cxx