Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 17 Nov 2011 10:43:42 +0000 (20:43 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 17 Nov 2011 10:43:42 +0000 (20:43 +1000)
commit219e320d4cfb49476be74a50c65c515fa8703f0f
treedfa999415125ea1b48248a4385785d936fdc31fa
parentb0d54f150e9b4211e263b4835dd2c64ac07a8c86
parent2ec828a2baa35725bedb56a2611e817a6c2d875e
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:
  QNAM: make systemProxyForQuery respect http_proxy