Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorMartin Jones <martin.jones@nokia.com>
Mon, 1 Mar 2010 04:33:35 +0000 (14:33 +1000)
committerMartin Jones <martin.jones@nokia.com>
Mon, 1 Mar 2010 04:33:35 +0000 (14:33 +1000)
commit20def6f5fe3e02bda1c5f5873ed1923d36511312
treefa54b317476e2cae5d9bc019c7d98e1c85556dd6
parent5aa4dd9f3fdc11d00b0b92a4dd5ec66cc4d1f24e
parentfdca50a7c6833b4d2d47d645a0186112a0cc5462
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml