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)
commit66f264f1153436cc0ace72e7ba16e077a284311c
treea05c3e31409c51835f13d390a838f013d6e9e613
parentaabda9f5c63ec37ff1669461de6a408bb4865fda
parent0cd93933d8e5cc69151958fc285936854ff86e47
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Make QDataStream test compile and re-enable it