Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
authorMartin Smith <martin.smith@nokia.com>
Thu, 17 Jun 2010 13:13:26 +0000 (15:13 +0200)
committerMartin Smith <martin.smith@nokia.com>
Thu, 17 Jun 2010 13:13:26 +0000 (15:13 +0200)
commit68a2073cca205d8a6c4a44305045e1ac64f664f0
treeb610391e5d85a1fd2086528621e905a5fcaf03f6
parent743443fe96725d7c1e5c9cce2422c2ceb9809efc
parentd8d547b92e02546cb030ac9d4a45fe0d89e0e7f6
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7