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>
Tue, 13 Apr 2010 13:03:43 +0000 (15:03 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 13 Apr 2010 13:03:43 +0000 (15:03 +0200)
commit70141f27e6151f7d7e635ef4ac99fb1f38a1f881
treeeaf8ffc78d30b0960051687fc031c98f70d9f6f7
parente5515b38a061ef78a1efd17772607c670a98dfab
parent914bc1cb6d29b9fda93be10e73bbcb15465cca8f
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:
  Fix typos, there is no QT_NO_SSL