Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorYann Bodson <yann.bodson@nokia.com>
Mon, 1 Mar 2010 05:35:47 +0000 (15:35 +1000)
committerYann Bodson <yann.bodson@nokia.com>
Mon, 1 Mar 2010 05:35:47 +0000 (15:35 +1000)
commit5d847f395b65b3e6df3eb71ccc1022077465f05c
tree01db9ac4382eedd3e552b8570100203f22201e13
parent1c9908d6d31326dbeed9d23b4f3ac3c8446d91b5
parentf800919c4336da77b73561cc5180fc167f61f435
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml