From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Mon, 23 May 2011 14:04:21 +0000 (+0200)
Subject: Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=780097f270c40814691459396661ebed90285ab8;p=konrad%2Fqtdeclarative.git

Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
---

780097f270c40814691459396661ebed90285ab8