Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging

Conflicts:
	src/declarative/items/qsgtextnode.cpp

diff --cc src/declarative/items/qsgitem.cpp
Simple merge

diff --cc src/declarative/items/qsgtextnode.cpp
Simple merge