Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 12:36:18 +0000 (22:36 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 12:36:18 +0000 (22:36 +1000)
commitf1efb2e8866203cbf95d288ea0ccb1992413c3fc
treec1113cb1473b4a5ba6c3c9d6653a8f88a76bf132
parent9c4118d913713181f06960f27ed1eb98c8607605
parentacea7c9f5ece102f22d264834b6eece21020adf4
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  QDeclarativeDebug: Fix autotest