Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 1 Jul 2011 16:05:55 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 1 Jul 2011 16:05:55 +0000 (02:05 +1000)
commitbc02c00130d6ebbd149caff8c21b6b1dc5c5451f
tree779945938b51cc6290bc6dcee1cb34f696f42242
parent3dc0c38389670d6adddd972c532af98dd6b5deb5
parent84f4a8590471928fcd5e98fb424a9b6b89603ef1
Merge branch 4.7 into qt-4.8-from-4.7