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 14:23:38 +0000 (00:23 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 14:23:38 +0000 (00:23 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Tests: Fix some compile warnings.


Trivial merge