Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 3 Nov 2011 17:02:35 +0000 (03:02 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 3 Nov 2011 17:02:35 +0000 (03:02 +1000)
commit79829b9871574c65c15bf0b6553a500dcff8d6b7
tree2e5cb7eb1453bfc4c0edde2418262136c90ebe45
parentc9d4611092e780c0cf386bd119d548398798b50a
parente3208a8d44423bc3b5c32e2e90f68675e51a3b73
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling
  Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr
  Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr
  Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916