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 13:49:29 +0000 (23:49 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 10 May 2011 13:49:29 +0000 (23:49 +1000)
commite35297e65d1de578202a3d1b784a70c4db65d356
tree17d3d4da3fe9a6eac39a637a450aa46096dd994e
parent09d6bb0ebd011dcbde77000dbffbb3fe7510529a
parent20594a6d5bbbc4d429b944080e7f65d66e6dae43
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 having Status undefined in xlib platform plug-in.