Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Fri, 27 May 2011 03:41:38 +0000 (13:41 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Fri, 27 May 2011 03:41:38 +0000 (13:41 +1000)

Trivial merge