Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging
authorGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 9 Jun 2011 10:56:27 +0000 (12:56 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 9 Jun 2011 10:56:27 +0000 (12:56 +0200)

Trivial merge