Merge branch '4.7-upstream' into 4.7-doc
authorA-Team <ateam@pad.test.qt.nokia.com>
Thu, 30 Sep 2010 22:00:24 +0000 (00:00 +0200)
committerA-Team <ateam@pad.test.qt.nokia.com>
Thu, 30 Sep 2010 22:00:24 +0000 (00:00 +0200)
commita49756f6756ddb1d4a89d21756b4f59c13078464
treeb64816458301e5218402cb47c3cbe40f419886dd
parent8c65dc25962e167237c2573979b1dfff88c29326
parent74d391adfd907d80ae35abe25fe346b2b4d649f9
Merge branch '4.7-upstream' into 4.7-doc