Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Mon, 22 Nov 2010 16:15:13 +0000 (17:15 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Mon, 22 Nov 2010 16:15:13 +0000 (17:15 +0100)
commit99f815d9675091e97afa09654a4e257d8afb8b97
tree6f7e7be222134fc9e0dfdff0041e985b21020910
parente0bd60f6c8a489c5703b648fe2e2470763f67e37
parent3e833cbf5e2d351d548a83f5d0c922760f775a43
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

No changes.