Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Aug 2011 21:06:26 +0000 (07:06 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 26 Aug 2011 21:06:26 +0000 (07:06 +1000)
commitdad08f791a05890dc94f91d2154a334eb4359a8f
treef4f8c67d7d33320382f4f56d87e26dde842f2807
parent6661f5c2222c145d854e225076195b37672637d2
parent91096126440aafba22aeb9307cb72135b3156a4c
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Porting the QTBUG-21084 fix to 4.7.4