Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 16 Jun 2011 04:08:29 +0000 (14:08 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Thu, 16 Jun 2011 04:08:29 +0000 (14:08 +1000)

Trivial merge