Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 12 Nov 2011 09:40:38 +0000 (19:40 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 12 Nov 2011 09:40:38 +0000 (19:40 +1000)
commitfbdde19e169975693bd179f3e493f0b588ed39f4
treefbbe555c03af88e2ee77ec570052df7ae51b0491
parent84076234b91444b5b5b206d5d2650d04b86c35d0
parent7a401da71f27ca9e9cd10bc8f1e0995a9992100d
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 e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas Kling
  Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza Reis Jr
  Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza Reis Jr
  Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99