Conflicts:
	src/plugins/debugger/gdb/trkgdbadapter.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
	src/plugins/texteditor/basetexteditor.cpp