Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 24 May 2011 10:01:46 +0000 (20:01 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 24 May 2011 10:01:46 +0000 (20:01 +1000)
commitfe0ae9fd2a59a29b42fefd8cacdf8b79cbf696e9
tree196e334429255b731bbdc31280592b2f1e04532c
parentda884123349531ef92fae89c530ea48a8a64c0cc
parent6c72eb845657b670af5435ef8084ae91e5dfbbdd
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
  fix Symbian ordinals for merge request re. utf8 characters in SSL certs