Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Apr 2011 07:04:38 +0000 (17:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Apr 2011 07:04:38 +0000 (17:04 +1000)
commitad95cfc5d6239ce25d8afbc2dc01a58b9b1bd8b4
treed9b5bdb1474f22507e46f5525777ffc43277f081
parent082b9125d627df11692f2a03b80c9e962e82eda5
parent65d255c80d0e029bc94b320fa315095b957098a0
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Remove workaround and fix properly
  Optimize loc.prf for localization
  Remove obsolete files from qt.iby