Merge remote-tracking branch 'origin/2.3'

author Eike Ziller <eike.ziller@nokia.com>

Fri, 16 Sep 2011 08:44:32 +0000 (10:44 +0200)

committer Eike Ziller <eike.ziller@nokia.com>

Fri, 16 Sep 2011 08:44:32 +0000 (10:44 +0200)
author Eike Ziller <eike.ziller@nokia.com>
Fri, 16 Sep 2011 08:44:32 +0000 (10:44 +0200)
committer Eike Ziller <eike.ziller@nokia.com>
Fri, 16 Sep 2011 08:44:32 +0000 (10:44 +0200)
diff --cc doc/qtcreator.qdoc
Simple merge
diff --cc src/plugins/plugins.pro
Simple merge
diff --cc src/plugins/remotelinux/qt4maemotarget.cpp
Simple merge
author	Eike Ziller <eike.ziller@nokia.com>
	Fri, 16 Sep 2011 08:44:32 +0000 (10:44 +0200)
committer	Eike Ziller <eike.ziller@nokia.com>
	Fri, 16 Sep 2011 08:44:32 +0000 (10:44 +0200)
		1	2
doc/qtcreator.qdoc	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugins/plugins.pro	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugins/remotelinux/qt4maemotarget.cpp	patch \|	diff1 \|	diff2 \|	blob \| history