Merge branch 4.6 into qt-4.7-from-4.6
authorQt Continuous Integration System <qt-info@nokia.com>
Sun, 10 Oct 2010 22:11:21 +0000 (00:11 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 10 Oct 2010 22:11:21 +0000 (00:11 +0200)
commitd04210c1f5f7a497b2640f223ede67bf5f2860c6
treeaffbce24e8018cdf82857ca2368f0d132bd4a20c
parent4809920df3c3329d47f595c1287ab44b454abb88
parent79f20ff18232f5b9a8df061a74b08948dadb7b8b
Merge branch 4.6 into qt-4.7-from-4.6