Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 07:31:10 +0000 (17:31 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 07:31:10 +0000 (17:31 +1000)
commit305577936dc880e80615e3c797a5a028e4b7c27f
tree9ab7c9431de235ffb264997542752541936333ff
parent359c5e4a7199aef7d5d2964b5bf8c21673e9384d
parent542ba35f2f0dfd265435f32ee79e498226989e6c
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix deadlocks in wayland clipboard that can occur in special scenarios.