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>
Fri, 28 May 2010 05:55:25 +0000 (07:55 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 28 May 2010 05:55:25 +0000 (07:55 +0200)
commit94d4a46c47718a56dea16ce73d92d35fee06c57f
treed02751bf49ae05a36c9f90cc865052644fe4748e
parent4915b686bf2533458caebbcfb5a194127535131d
parente8eb56b742cacd896658b64bec5eec0483b69716
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:
  Add missing license header.