Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 9 May 2011 16:05:54 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 9 May 2011 16:05:54 +0000 (02:05 +1000)
commiteabcaaa9be03674d45e6bb53e098d5b5b3e9ef81
treeaa9b70c23b2a5437d19bef9bba74373ba699cbfa
parent4ec3288621aabc17ba8637611d39128566072047
parentdb934a4e287f083f41e6a6ad1d48bbf223588efa
Merge branch 4.7 into qt-4.8-from-4.7