Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Jul 2011 16:06:15 +0000 (02:06 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Jul 2011 16:06:15 +0000 (02:06 +1000)
commit981903e519abfd6d3d28a44778032728d31e1853
tree2d38531d6ff1882c84420185fe628ab057a183ba
parentab620c451c30e05e8667ed9c8ec813c99738253d
parent189a91d8159a687a5eb9b56a7b07f9a186eb3931
Merge branch 4.7 into qt-4.8-from-4.7