Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 08:51:11 +0000 (18:51 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 08:51:11 +0000 (18:51 +1000)
commitfd5acfc663383c38e4d0993a4163023d46137e32
treeabf247eae2e410af800aedeb5d30d4f5529d9f7b
parente07f691ff700399b4e24eb618d64e9522a8ab430
parent8e4fecb730fda4dac801b4f8e618ecae8103c00c
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed bug in meego graphics system runtime switching.