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>
Tue, 29 Jun 2010 00:59:53 +0000 (02:59 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 29 Jun 2010 00:59:53 +0000 (02:59 +0200)
commit430449b678606037f9c31e02dd315fb6a82b6b09
tree54d547577a2ef7541e311dd2bf8cee00b8824a5c
parente391d5bb96e08db99ecb5e9efcda439450922dcc
parentd00b63a4a7a1b962657aebefc3167a62cc93ade6
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 38d650efc92427cd6452f6685d3c40d22428cdb7