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)
commit4050f125267743204c593462f3d7bcec824cd64c
tree91378749d8a0456fc9b0a9bb3355dcd939a5a3b1
parent7ef7ac972f0c56c6d655c4c63eaa1d67fdf4dd0c
parent6e99936502345eab6ef7862e2cb3740bcc1caef2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Track Wayland changes