Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 20 Apr 2011 16:04:48 +0000 (02:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 20 Apr 2011 16:04:48 +0000 (02:04 +1000)
commit36e0a25a36823a9c425851fc742ce1b3df9060ca
tree4a2e00133ecbcb9af156587c1381a5e41eed5abf
parentd6a8beb9b15dc6cc6fe5d546d81c953e7f68520b
parent55b84a03e33b87e44b2e65ed1c02f93aa553c323
Merge branch 4.7 into qt-master-from-4.7