Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging
authorKai Koehne <kai.koehne@nokia.com>
Mon, 2 Jan 2012 09:28:35 +0000 (10:28 +0100)
committerKai Koehne <kai.koehne@nokia.com>
Mon, 2 Jan 2012 09:28:35 +0000 (10:28 +0100)
commit3bbfcb2e9b75b159da308373f24d5b9869162a9a
treea09c949950e89585e787d522db0d0cce2def20da
parent2cfbc2b874ebec52ee76adc60b51dca138827d8c
parent2721d69e64e7bd411c1ff51ce82ebafa7dbf3314
Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging