Conflicts:
	desktop/prj/build.lst
	helpcontent2
	l10ntools/Executable_gsicheck.mk
	l10ntools/Executable_uiex.mk
	regexp/inc/regexp/reclass.hxx
	solenv/gbuild/AllLangResTarget.mk

Change-Id: I398f0cd9e7daefa8d2e04fd977d5bc2e9708169b