Merge remote branch 'origin/2.2'

author con <qtc-committer@nokia.com>

Fri, 29 Apr 2011 08:27:58 +0000 (10:27 +0200)

committer con <qtc-committer@nokia.com>

Fri, 29 Apr 2011 08:27:58 +0000 (10:27 +0200)
author con <qtc-committer@nokia.com>
Fri, 29 Apr 2011 08:27:58 +0000 (10:27 +0200)
committer con <qtc-committer@nokia.com>
Fri, 29 Apr 2011 08:27:58 +0000 (10:27 +0200)
diff --cc src/plugins/debugger/debuggerengine.cpp
Simple merge
diff --cc src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
Simple merge
author	con <qtc-committer@nokia.com>
	Fri, 29 Apr 2011 08:27:58 +0000 (10:27 +0200)
committer	con <qtc-committer@nokia.com>
	Fri, 29 Apr 2011 08:27:58 +0000 (10:27 +0200)
		1	2
src/plugins/debugger/debuggerengine.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history