Merge branch 4.6 into qt-4.7-from-4.6
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 24 Nov 2010 16:03:13 +0000 (17:03 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 24 Nov 2010 16:03:13 +0000 (17:03 +0100)
commit22b2a33aba2660e433de473cdadb540a33d8a6aa
treeeb3966aef023e05486d23dedac27b28de070e5c5
parent236e57bc9d85c4b05514dd3b792bf8e144320023
parent03c2fb7e9c39b433232fb6a18881cd8419d8237b
Merge branch 4.6 into qt-4.7-from-4.6