Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 06:53:35 +0000 (16:53 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 06:53:35 +0000 (16:53 +1000)
commit07a22fc4a00901f2ff769346cb1ada6fc8a2bd90
tree4a80562176de3b9f5d3d13a079da6d153045f6b8
parent4631d297781b8ad4eba0735b7023265d4872c1cb
parentec4b73992eb7fb7254bb7a1524b8691ef2123b9f
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Workaround crash when multiple QNetworkAccessManager instances are used