Merge branch '4.7-upstream' into 4.7-doc
authorA-Team <ateam@pad.test.qt.nokia.com>
Fri, 5 Nov 2010 23:00:12 +0000 (00:00 +0100)
committerA-Team <ateam@pad.test.qt.nokia.com>
Fri, 5 Nov 2010 23:00:12 +0000 (00:00 +0100)
commit84de3d47a2fd5400920ad570b443b6bb95c8c766
tree5fa4a5ff143e96a2b75831cf4c0f6f7bc623fb0a
parent915aa77e130e4722173df10e7bb6816c54a2c4e4
parent6ac4bc5cb7ac7500b39ea6828fdf76e95a2c2f0b
Merge branch '4.7-upstream' into 4.7-doc