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, 24 Aug 2010 07:51:33 +0000 (09:51 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 24 Aug 2010 07:51:33 +0000 (09:51 +0200)
commit76680eff3fbbdaace80bdb89f68e678c4c99e492
tree96de0b65349401490c4ca961a4d17499ae579cb6
parent180fdc19835d38962ada5e6d76f7c928082b6ebc
parentd38eb22b9f5b408d67ea0244e45c13d6d0665d8d
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: Prepare a compression auto test related to a future bugfix