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 16:35:23 +0000 (18:35 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 28 May 2010 16:35:23 +0000 (18:35 +0200)
commit50eda57f06bd42ce56695ec9d55c33e7173904a7
tree3e62d4565880fe003dcd5866c38b2b1921bcfead
parent035129c96d714ba6183057ff2b77658d993394db
parent15ca23e924b9326fe810529682e0b24b361217ae
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:
  Update def files for 4.6.3