Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 19 Apr 2011 16:03:31 +0000 (02:03 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 19 Apr 2011 16:03:31 +0000 (02:03 +1000)
commit30d8a101858e0e34aafe7252a8b37d05841494d2
treeb38a694a62574331e008086ca11208b9de8c7df5
parent63bf7cd581d9f69fecae82921d5c2c5b5eddc04a
parent2ba170cfdcfa8166b78bc2dbfa7ca5c402b13a29
Merge branch 4.7 into qt-master-from-4.7