Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorMartin Jones <martin.jones@nokia.com>
Mon, 30 May 2011 01:42:04 +0000 (11:42 +1000)
committerMartin Jones <martin.jones@nokia.com>
Mon, 30 May 2011 01:42:04 +0000 (11:42 +1000)

Trivial merge