Merge remote branch 'qt-qml-review/master' into master-qml-staging
authorKai Koehne <kai.koehne@nokia.com>
Thu, 26 May 2011 11:07:01 +0000 (13:07 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Thu, 26 May 2011 11:07:01 +0000 (13:07 +0200)
commitb0f5a46499c4afad7a32143a817039b707e2a067
tree41d5a3f511794a591f46194cfc7d9421291ac766
parent565bd12bdc7b73e4222de44699df9904a1cfcd81
parentc3d78b69435a951e708c54236a68f55a65ee7e12
Merge remote branch 'qt-qml-review/master' into master-qml-staging