Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-qml...
authorKai Koehne <kai.koehne@nokia.com>
Thu, 12 May 2011 14:19:07 +0000 (16:19 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Thu, 12 May 2011 14:19:07 +0000 (16:19 +0200)
commit21711d7ad54b0ee83e776ac3ad83121221fdf24b
treeeeb331ea0a428d878b25bacbdb701aa0be493f4e
parent5c830ed2a612b940c377fb4e8a2372655f175707
parent5e8f97047a31a53a98c8bc71159e00cc56bda94d
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-qml-staging