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 10:34:04 +0000 (11:34 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 27 Feb 2010 10:34:04 +0000 (11:34 +0100)
commitd09a9e38a3af2da22ee5555060a59906322c5437
tree9696e5a9cf51a2e50fab18ccaa91bee5b4450884
parent6396e7a15079cb157caef319348a0bcd0b95a6a7
parentf33ee0c7883cc525b4fbb81c6128bde51cd5e233
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: