Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Dec 2011 22:27:49 +0000 (08:27 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Dec 2011 22:27:49 +0000 (08:27 +1000)
commite22d40a6143709da6ee26c2f8e1b6a05904fd9b4
treeaaaf6d7ebd7c8cdddcc4392551bf70f0040afe70
parentc0935e422d3be456c80fda287f291986da88db8f
parentebcfb56d3631d4fa2b2259cf3a064d541ec533cd
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Fix crash in positionInLigature