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

Trivial merge