Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
authoraavit <qt-info@nokia.com>
Wed, 31 Mar 2010 12:00:03 +0000 (14:00 +0200)
committeraavit <qt-info@nokia.com>
Wed, 31 Mar 2010 12:00:03 +0000 (14:00 +0200)
commit85313fec454f77322deb7041726573e14f6a262a
treee0151a738a3acc91e16411869e160042e63bbc9a
parent2fe059c863377befdcf65084a07a7f4841beef0d
parent93ae014d7ee06a6ebb701420fffef5895cd731c4
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7