Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorEckhart Koppen <eckhart.koppen@nokia.com>
Fri, 13 May 2011 20:00:00 +0000 (23:00 +0300)
committerEckhart Koppen <eckhart.koppen@nokia.com>
Fri, 13 May 2011 20:00:00 +0000 (23:00 +0300)

Trivial merge