Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 25 Feb 2011 16:03:46 +0000 (02:03 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 25 Feb 2011 16:03:46 +0000 (02:03 +1000)
commit2ccf2a09653d25c87e9a50dc842d2aff54fa914c
treed846c6f967545dd7f5480250e890de066b726244
parent184398f4ada4b34fc9834c2341597a3b8c18e842
parent3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0
Merge branch 4.7 into qt-master-from-4.7