Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 10:36:27 +0000 (20:36 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 10:36:27 +0000 (20:36 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  add test case for ipv6 url parsing


Trivial merge