Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Tue, 14 Jun 2011 01:45:20 +0000 (11:45 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Tue, 14 Jun 2011 01:45:20 +0000 (11:45 +1000)

Trivial merge