Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 20 Jun 2011 07:47:47 +0000 (09:47 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 20 Jun 2011 07:47:47 +0000 (09:47 +0200)

Trivial merge