Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 23 Feb 2011 16:10:57 +0000 (02:10 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 23 Feb 2011 16:10:57 +0000 (02:10 +1000)
commit373d8a06c21fb3d237d1f2c7be604e1bcf7e42fa
tree468443eb03537624ed2ca56bdf07026da49745ad
parent5a2f7b97d564e4b8a9619cd7aa1519b4dd084ae8
parentbf2f68704ca62fa5ac21c0559dc896f02cf4775d
Merge branch 4.7 into qt-master-from-4.7