Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorBea Lam <bea.lam@nokia.com>
Mon, 1 Mar 2010 05:05:38 +0000 (15:05 +1000)
committerBea Lam <bea.lam@nokia.com>
Mon, 1 Mar 2010 05:05:38 +0000 (15:05 +1000)
commit3e8065867d36dd8a562ca4c0c310a9b129ec50e1
tree8a86283d5aac09750a589072a449c175faf75810
parente8b2404e04ff38511a96ae2dfb2aa097c6ec8166
parent7fed799b0ac8c472c99d28943ab9d8aae78a9836
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml