Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 4 Nov 2010 07:59:05 +0000 (08:59 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 4 Nov 2010 07:59:05 +0000 (08:59 +0100)
commit1a7a1172d048108c30a9890ce9477686711ad756
treedc3db3ec8ae56fc8f13440a550e55959d4bf40bc
parentab672d88f906b0d6f2d45f9ebbfbf12fdcfba51e
parentadc6d4776e6570fa6e6d5d2e4e40fe7eab0ebb99
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix bearermonitor when building for Maemo in scratchbox.