Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 25 May 2011 07:12:22 +0000 (17:12 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 25 May 2011 07:12:22 +0000 (17:12 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile.


Trivial merge