Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 11:07:48 +0000 (21:07 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 11:07:48 +0000 (21:07 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Track Wayland changes


Trivial merge