Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 00:37:23 +0000 (10:37 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 00:37:23 +0000 (10:37 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove Qt3Support code from QVariant autotest.
  Remove obsolete test data
  Remove Qt3Support code from QMenuBar test, part 2.


Trivial merge