Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 8 Jun 2011 16:06:10 +0000 (02:06 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 8 Jun 2011 16:06:10 +0000 (02:06 +1000)
commitfa4365c6996460a2aefc8df36ae3d61810c1f043
tree65fc19d80196306551458ee114afc865c5b7e4c5
parentbe25f9e17eac2b99d83951dbc0bd1b6e09d91e57
parent0c62d147c21da6f0b812820944fbb2a63cea1e4a
Merge branch 4.7 into qt-4.8-from-4.7