Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into...
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 27 Feb 2010 22:48:55 +0000 (23:48 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 27 Feb 2010 22:48:55 +0000 (23:48 +0100)
commitc5adadc72c3d1759143988760c8375008d58ba92
tree4a39ae324867068f0c159ab123ae581a2672d9c6
parent615b4b5fba61daf4884f7e2c04fc71a4ab9e0a30
parentd09a9e38a3af2da22ee5555060a59906322c5437
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: