Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Apr 2010 14:59:19 +0000 (16:59 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Apr 2010 14:59:19 +0000 (16:59 +0200)
commite09c61235dab9de1111372ee05eb51004eda5569
treebb9b6d404e1a3e6bedac121096d9a1076eb80655
parent64a360f45ab9a1c50ca628cfd6b670b93816c756
parent06add85eb8a9bd8f53acd162ce665d46e7ebc137
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Regressions in Global Object prototype access
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )
  Autotest: fix paths on the test server after update.
  Fix typo in docs.