Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 01:39:26 +0000 (11:39 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 01:39:26 +0000 (11:39 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Make QDataStream test compile and re-enable it


Trivial merge