Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 05:28:28 +0000 (15:28 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 05:28:28 +0000 (15:28 +1000)
commit17b1c4f48b7915eff9a953ccc1d6f13cea178e6c
treeb3eaeb46c69f51d696bd405527ab22be38985258
parentf1efb2e8866203cbf95d288ea0ccb1992413c3fc
parent00a72cd1f5aff15d5a3a59d61efd2f5653d7dd34
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:
  Fix QtDeclarative keyinteraction example