Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 5 May 2011 01:29:03 +0000 (11:29 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Thu, 5 May 2011 01:29:03 +0000 (11:29 +1000)

Trivial merge