Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 00:42:03 +0000 (10:42 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 10 Jan 2011 00:42:03 +0000 (10:42 +1000)
commitbda70d6b6f5913e4cbeafb82845627c266c545a4
tree73331d0c48023ed9f5489735443d2b56b3d67736
parent2707cdd482c975e58a4736ac85c32af45435f561
parent026a24855ec16626ab101007719a836f5a4e3c47
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  network tests: make IMAP, FTP testdata more flexible.
  Remove garbage empty test.
  tst_networkselftest: add checks for echo, daytime