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 12:53:06 +0000 (22:53 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 12:53:06 +0000 (22:53 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Wayland: send surface id + process id pairs to compositor


Trivial merge