Merge branch '4.7-upstream' into 4.7-doc
authorA-Team <ateam@pad.test.qt.nokia.com>
Sat, 6 Nov 2010 23:00:11 +0000 (00:00 +0100)
committerA-Team <ateam@pad.test.qt.nokia.com>
Sat, 6 Nov 2010 23:00:11 +0000 (00:00 +0100)
commit146f97525ca49822bb684e1e4d9e62ff5484da36
treea69f1e18652dbd5a6eb63df2f6395309c87b7af2
parent84de3d47a2fd5400920ad570b443b6bb95c8c766
parent983bfa4a069b8bf51913be461c6a79c71fa18792
Merge branch '4.7-upstream' into 4.7-doc