Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 23 May 2011 14:04:21 +0000 (16:04 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 23 May 2011 14:04:21 +0000 (16:04 +0200)

Trivial merge