Merge branch '4.7-upstream' into 4.7-doc
authorA-Team <ateam@pad.test.qt.nokia.com>
Thu, 25 Nov 2010 23:00:22 +0000 (00:00 +0100)
committerA-Team <ateam@pad.test.qt.nokia.com>
Thu, 25 Nov 2010 23:00:22 +0000 (00:00 +0100)
commit42cb23ebf64b0b108f9581a4516e42c3a0f1b069
treeeb57bfc054e977f07c094b10515a1c378fc2fbf1
parentdcce5c796e5cd5cb090f1c395e483269bab01566
parentc2f6fe50c06e4285085db17ea3a9d9254cf21f48
Merge branch '4.7-upstream' into 4.7-doc