Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 6 Jun 2011 16:07:42 +0000 (02:07 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 6 Jun 2011 16:07:42 +0000 (02:07 +1000)
commitd4c00ffb6f01a991118388957de831394c8ad9c1
treed543b8defda50b5c5b6c6d3626a43615339972ff
parent872da4c22ed2a82c7e2624b8aef8ebba6c1323d9
parent6783649cd1b3d50febf74f3d1a24e198973c7b21
Merge branch 4.7 into qt-4.8-from-4.7