Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 30 Nov 2011 19:35:57 +0000 (05:35 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 30 Nov 2011 19:35:57 +0000 (05:35 +1000)
commitf485ac02b057cb076c965c3cd1bd9c78aaa5a696
tree83b2d1ddc4499ba53b20278dc4dd9f29c16f5946
parentc2146b319172d8fa8b4e9cdfee362fcbdfde632f
parent5e07a3ac58f93bd5e09715d43b58c20950c2befa
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix HarfBuzz Thai character SARA AM handling