Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorMartin Jones <martin.jones@nokia.com>
Tue, 29 Jun 2010 03:33:48 +0000 (13:33 +1000)
committerMartin Jones <martin.jones@nokia.com>
Tue, 29 Jun 2010 03:33:48 +0000 (13:33 +1000)
commitbe8bf6e6b57197d8e34c95905a6e61952e5e9766
treebcc9ebe2b00dd74b44ad5486fb0c5b90e2e573a0
parentc0502481e49ea2c72a767a80fafdb51f8a135c98
parentf54353bf2f566335e44d20b5263fe19d5ac33d1e
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7