Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Aug 2011 13:17:29 +0000 (23:17 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Aug 2011 13:17:29 +0000 (23:17 +1000)
commit20b1263695169e88207c8a4c4aac968a6044931b
tree9e0e4fc0ffca382f43d9306e327b76f2059e8bae
parent8f389d20bc01a355a6a1885b5bd1d30bd2ff0c71
parentc1491c356f3cca92a359468ce37f38bc1873eec4
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Fix memory leak in ListModel custom parser
  Correct documentation of TextInput.PasswordEchoOnEdit.