Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Apr 2010 13:19:04 +0000 (15:19 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Apr 2010 13:19:04 +0000 (15:19 +0200)
commit840c234385ef1e2fe20b86e114bc0d9811b59880
tree680b0cc4af1db368a0125aab3d63f9a468a71751
parent1c47be7174ca1e9ed393a12461742975079710d7
parent9cc9da431fd99869a83b91f5be4911e0ead2f15f
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  QtWebkit WINS DEF file freeze