Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Dec 2011 18:33:40 +0000 (04:33 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Dec 2011 18:33:40 +0000 (04:33 +1000)
commitc0935e422d3be456c80fda287f291986da88db8f
tree921b30e2a8353ab086ce0927a3bd535adcd0229f
parentb3ff9483fa7e1193e466b62bbcead3e5d99c8c70
parent4db91cbd6147e40f543342f22c05b7baddc52e5a
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  SSL: fix build with -openssl-linked for OpenSSL 0.9.8*
src/network/ssl/qsslsocket_openssl.cpp
src/network/ssl/qsslsocket_openssl_symbols.cpp