Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 16 Dec 2011 15:08:49 +0000 (01:08 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 16 Dec 2011 15:08:49 +0000 (01:08 +1000)
commit5d20a068763590ea02fb35a533241cc784bc6fd5
tree4f2d931a33aa2bf2be6559a86a372a2b59c30856
parent9312e24343468e87a293bc2e24a43264d23e5d13
parentafa0b42ba94de7533521ae705bdd1762fea9f50b
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:
  Symbian: fix tst_QMenuBar::task256322_highlight() regression