Conflicts:
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	dtrans/source/win32/dtobj/XTDataObject.cxx
	dtrans/source/win32/dtobj/XTDataObject.hxx
	sot/source/sdstor/stgio.cxx
	tools/source/debug/debug.cxx
	vcl/source/gdi/jobset.cxx
	vcl/unx/kde4/KDEData.cxx
	vcl/unx/kde4/KDEData.hxx
	vcl/unx/kde4/KDESalDisplay.cxx
	vcl/unx/kde4/KDESalFrame.cxx
	vcl/unx/kde4/KDESalFrame.hxx
	vcl/unx/kde4/KDESalGraphics.cxx
	vcl/unx/kde4/KDESalGraphics.hxx
	vcl/unx/kde4/KDESalInstance.cxx
	vcl/unx/kde4/KDESalInstance.hxx
	vcl/unx/kde4/KDEXLib.cxx
	vcl/unx/kde4/VCLKDEApplication.cxx
	vcl/unx/kde4/VCLKDEApplication.hxx