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>
Fri, 2 Jul 2010 21:30:25 +0000 (23:30 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 2 Jul 2010 21:30:25 +0000 (23:30 +0200)
commit8c01157a9056f91d40d3579bfc0eb9b81a5f99d8
treeaf9fca7d74c963ac6a8134173ff5284af6bc9ef0
parent0eee17b5d789c2314f582e363e377809ef6dea7c
parent9951dd835e8c0ccad1a0c92eb2af96f778242fc3
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:
  Updated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9