Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 8 Nov 2010 02:15:01 +0000 (03:15 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 8 Nov 2010 02:15:01 +0000 (03:15 +0100)
commit22c01928872db30bd47c740abd714989ac910b95
treefff07026cfbfed1461be3ad43749c5c7624059c4
parent983bfa4a069b8bf51913be461c6a79c71fa18792
parent465d2c6356bdfd70bd28c6ec53191e73682b06c1
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Task-number: QTBUG-15059