Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorBea Lam <bea.lam@nokia.com>
Mon, 1 Mar 2010 06:05:05 +0000 (16:05 +1000)
committerBea Lam <bea.lam@nokia.com>
Mon, 1 Mar 2010 06:05:05 +0000 (16:05 +1000)
commitfa7053103f4aa528972dc8766c05b5a1371b2bd8
treef04c0bc684293e17c970ea156ce1827e57b590c6
parent3e8065867d36dd8a562ca4c0c310a9b129ec50e1
parent5d847f395b65b3e6df3eb71ccc1022077465f05c
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml