Merge branch '4.7-upstream' into 4.7-doc
authorA-Team <ateam@pad.test.qt.nokia.com>
Wed, 3 Nov 2010 23:00:12 +0000 (00:00 +0100)
committerA-Team <ateam@pad.test.qt.nokia.com>
Wed, 3 Nov 2010 23:00:12 +0000 (00:00 +0100)
commit4b0ced38a3e52836a8122bee95fa9056818e1206
tree6671ef68a3c7d698a091aa6be1740248ad14babe
parent852cefcbcc92006dcb18c846f4e2f2dfe5b56410
parent671eb89e41c90cc4cb11eca1c76181d1186db2b2
Merge branch '4.7-upstream' into 4.7-doc