Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging
authorMartin Jones <martin.jones@nokia.com>
Tue, 31 May 2011 22:53:40 +0000 (08:53 +1000)
committerMartin Jones <martin.jones@nokia.com>
Tue, 31 May 2011 22:53:40 +0000 (08:53 +1000)

Trivial merge