Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 30 Nov 2011 18:56:40 +0000 (04:56 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 30 Nov 2011 18:56:40 +0000 (04:56 +1000)
commitbb033b56ed2cd58fd51c891e759618cbe3b02c96
treebcbfe1251676388701029b62bf0ec9739f828fe9
parentd36732f2456569d5fde1559b717c596c7933ffeb
parent67d146092a6c11f1ca3c622ae0737202ca292a58
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  Backport SMP safe initialisation of QNetworkConfigurationManager