Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 01:13:27 +0000 (11:13 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 01:13:27 +0000 (11:13 +1000)
commit7c2ea533997f547ea44efcadbd311e75e46ba0c1
treec643116900125c27db3c381df3c65dd54fb00f71
parent1072379e34be71dd7cbacf762a9a1647278e2b95
parent01a374fe8a6ac0b6e374081c07720e77c61effff
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:
  Doc