Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 28 May 2010 10:34:54 +0000 (12:34 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 28 May 2010 10:34:54 +0000 (12:34 +0200)
commit6da180b5cd20afbc5f376a9055756839e6f25861
tree9d44c1b1de996613566b7938ad6e20e14503926d
parent94d4a46c47718a56dea16ce73d92d35fee06c57f
parent4da685d072d91e6e29f8531d002f59740ce1203e
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Added support for Indonesian language on Symbian.
  Fix for Norwegian and Korean languages on symbian.
  Added Korean and Nynorsk locales support on Symbian.