Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 23 Nov 2011 06:03:17 +0000 (16:03 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 23 Nov 2011 06:03:17 +0000 (16:03 +1000)
commit8960973e97713205d1aeb209806daca456c55111
treede1541e307f870d1efbcf413346ef8e54032e077
parent1e0530130a8d2afeecfa60bb898c055d15ff8a82
parent951e46bc21168cb66780f932006ec41b7dfea234
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:
  QNetworkProxy documentation: mention usage of "http_proxy" variable