Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 03:16:12 +0000 (13:16 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 03:16:12 +0000 (13:16 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tests: clean up usage of QT_CONFIG to fix circular dependencies


Trivial merge