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)
commitde18164da6f5e22052fa77493ac5666e31fab2e7
tree880595b131a42c4add75d6ebb656d63d8fc49818
parentccb5ea669ee192e93c76e7412bcebfc6810a8eba
parentfba41ea10b5d5703f06ad5514aec6a3e8e8f6f14
Merge branch 'master' into qtquick2