Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 02:42:53 +0000 (12:42 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 02:42:53 +0000 (12:42 +1000)
commit85b089dec584fcc51ad7703ea015ea724c132ed4
treec66161d861732ce48a121520931018f66bce7c64
parenta2418eed6e4e5aabe1274c57c7fc279a66fa2333
parent637456edef085d1825f15429cd921f2f0d4bd6a2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  Remove Q_ASSERT's from qsharedmemory autotest