Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 28 Apr 2011 13:08:33 +0000 (15:08 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 28 Apr 2011 13:08:33 +0000 (15:08 +0200)

Trivial merge