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

Trivial merge