Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 16:07:56 +0000 (02:07 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 16:07:56 +0000 (02:07 +1000)
commit2de195b450089a81c84fb463902844237e033aa5
treea59318fd7cd0f330287e7a9bdcab53eb1875fd3f
parentff112f47c86ec49a04afcd932475ab6d6a1eda77
parent8e8e0b26b6674e15f1ea01b4a1a05169fa762722
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Prevent crash in wayland mimedata in case there is no offer.