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)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove Qt3Support code from QDataStream autotest.


Trivial merge