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 07:26:39 +0000 (17:26 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 07:26:39 +0000 (17:26 +1000)
commit7ef7ac972f0c56c6d655c4c63eaa1d67fdf4dd0c
tree38c14cdf0c32b03f19ad109e968b17ac02d92e3c
parent0e7af4386b24ab32d3d99a128fa46bb81e4d9fa0
parent44be214a785cbf1e6fd43aa1899cc6407536d7d3
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Add task numbers for disabled autotests