Merge branch '4.7-upstream' into 4.7-doc
authorA-Team <ateam@pad.test.qt.nokia.com>
Thu, 4 Nov 2010 23:00:18 +0000 (00:00 +0100)
committerA-Team <ateam@pad.test.qt.nokia.com>
Thu, 4 Nov 2010 23:00:18 +0000 (00:00 +0100)
commite2e4fda34680cd6f6bcda877281abb8eed39df4d
tree07951d0079e91c1ad9e9eee806eefb9796aa839c
parent05039d6759e00767fcbb135100824e7fad1b07b2
parent1a7a1172d048108c30a9890ce9477686711ad756
Merge branch '4.7-upstream' into 4.7-doc