Merge branch 'qtquick2'
authorGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 08:01:37 +0000 (10:01 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 08:01:37 +0000 (10:01 +0200)

Trivial merge