Merge branch 4.6 into qt-4.7-from-4.6
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Oct 2010 12:15:58 +0000 (14:15 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Oct 2010 12:15:58 +0000 (14:15 +0200)
commitff9206bb268b816e1932eca7091bed16c9fd2426
tree6beba0597775c54f747bb9de98f161e46aec47a4
parent62a2fe9092d3b6038a08f5c5a7faa4a863b84fdc
parent46822d7091ef05e64e363e7209ea3e613e4d386d
Merge branch 4.6 into qt-4.7-from-4.6