Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 11:40:55 +0000 (13:40 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 11:40:55 +0000 (13:40 +0200)
commit8f011df08139bea59c12ae0804969334a9374dc8
treebd293e30b981f26b44712055baea893ce9ab7858
parent10830900ce5ff361c52b8c244ba14e53e98722f0
parent6a650220f6cf3159bcce3f754e94ea5241c67ea4
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Added some changes for 4.6.3