Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging
authorGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 9 Jun 2011 10:56:27 +0000 (12:56 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 9 Jun 2011 10:56:27 +0000 (12:56 +0200)
commit4faeb7aa0e33d824afb4db1411e6880140bb828a
treea98703a11b8742d88b65617bf35b74f595c2783e
parenta081f12ad755d186596e1b4b98bf908be342c874
parent452e13b5407fa4c36f9a573c305d41f551762b93
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging