Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Wed, 15 Jun 2011 08:55:41 +0000 (18:55 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Wed, 15 Jun 2011 08:55:41 +0000 (18:55 +1000)

Trivial merge