Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 20:13:27 +0000 (22:13 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 27 May 2010 20:13:27 +0000 (22:13 +0200)
commit4915b686bf2533458caebbcfb5a194127535131d
tree6977b2a93eae6c1498ab09c31e51290a3306c7bd
parent8e8844a1d3e9be22f84ef2b22312dd261a911092
parent3acedecda374aa56a0d4a6536a45baee54b3e64c
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixes for the s60theme tool