Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 03:42:59 +0000 (13:42 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 03:42:59 +0000 (13:42 +1000)
commit6772f8802d9766750372317b55d032b3457837d8
tree5ce8f2f762ba76d098c97583f6ea0cba610ed092
parent429946733541fdcdea13d5e470f61ac530b53980
parentc2eb7bb0801bfeaf2efed120b9f9bdf09d4d1f20
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove Qt3Support code from QDataStream autotest.