Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 26 Mar 2010 00:08:21 +0000 (10:08 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 26 Mar 2010 00:08:21 +0000 (10:08 +1000)
commit82c4fe87a9b2f65354803b9b6dc2054c4c63c8e8
tree2d206134bb71260fa580160c7c75c351a4867e29
parent9f6b271e942d48cef566891bd9d9712e147df3a2
parentf75961dfd20b82f2f5e2a4b7feaf59c841a93f6b
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7