Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorMartin Jones <martin.jones@nokia.com>
Tue, 10 May 2011 05:34:37 +0000 (15:34 +1000)
committerMartin Jones <martin.jones@nokia.com>
Tue, 10 May 2011 05:34:37 +0000 (15:34 +1000)

Trivial merge