Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 05:34:05 +0000 (15:34 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Mon, 23 May 2011 05:34:05 +0000 (15:34 +1000)

Trivial merge