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>
Thu, 12 Aug 2010 23:46:50 +0000 (01:46 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 Aug 2010 23:46:50 +0000 (01:46 +0200)
commit574845691eec14d4df0d13bb182a83c997546150
tree6fd9a810ec0579cb617824d47aa1e4d4e193d242
parentb0d2a439314bc86e6e15fe033c1edaee471b4b95
parent12f129eb1e1472e5eec561ab780ed709e5b66987
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:
  QNAM HTTP: Fix crash related to aborted uploads