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, 19 May 2011 15:52:28 +0000 (01:52 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 15:52:28 +0000 (01:52 +1000)
commit55dadee60cb74cf758ad962654a066314979bfdc
tree0f3a7775c72c9ff7a6f7a61bbb38878c78ff747c
parente6d2e23a0694146e4050560f2fb8100f40188597
parente46e32644720f0ddeb553b8a658c1711a4b5cdfb
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:
  Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses