Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging
authorKai Koehne <kai.koehne@nokia.com>
Fri, 12 Aug 2011 08:08:28 +0000 (10:08 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Fri, 12 Aug 2011 08:08:28 +0000 (10:08 +0200)
commit4a64a943a7f351c41c49784ea10a229f87a7476f
treeb4196e053baed2b579b0e1eab7d6fff3cb850b0b
parentd3599ab224f00915045562562c7fd4d6b9b9aeb4
parent2950403d62fd169bfa8ec081acfad684dcbe13cb
Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging