Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 27 Apr 2011 16:09:29 +0000 (02:09 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 27 Apr 2011 16:09:29 +0000 (02:09 +1000)
commit5159920a3bd2ab75035fd130a3b840cd856021bd
treef37d2126422fac3fb75a2e11da43b52bb7d75120
parent896db169ea224deb96c59ce8af800d019de63f12
parentfb8087d11c898dead021d5b51da7d2c5cb85842b
Merge branch 4.7 into qt-4.8-from-4.7