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>
Tue, 25 Jan 2011 03:12:02 +0000 (13:12 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 25 Jan 2011 03:12:02 +0000 (13:12 +1000)
commita0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40
treefafbbb89ac57a26ec4397b650ab4be1c6f2e6b46
parent4fcce8c4b2323e054c90048a11a2a483f7884dd7
parentcfb7c16d738993fc8a594361f4bdf10e24fa754a
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:
  Avoid possible font name collisions on fbserv