Merge branch 'master' into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 20 Jun 2011 07:22:36 +0000 (09:22 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 20 Jun 2011 07:22:36 +0000 (09:22 +0200)

Trivial merge