Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 7 Mar 2011 16:04:22 +0000 (02:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 7 Mar 2011 16:04:22 +0000 (02:04 +1000)
commit936a88c9eb905e336c571e89ad2f7e5db2d5e9a5
tree8133be8d8b298bb27aef647486bd76d84e654af6
parentca83e2df556e4e3db361ffd09696ef6c94d7324e
parentdda11ee48e323f4f4c6490822aa8921d5d6e3e69
Merge branch 4.7 into qt-master-from-4.7