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>
Thu, 3 Feb 2011 12:43:24 +0000 (22:43 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 3 Feb 2011 12:43:24 +0000 (22:43 +1000)
commita6c9422dc2103ee439696b24932149c5b08f2db8
tree6a06a9fa84c3f4e6d1e4d153ddd5071365428e0f
parent4de2ce7717ba52d3056f10e0a9fbb44eba4091bc
parent940d30e9cd76e9b98dd04c2e25a27b6a90bb34b9
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:
  My changes 4.7.2