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)
commit49cf3e27e2b63ca799d5fb8478673d4c92ff2995
tree314b24f30aa4e1f0a416ebc346eafa3c5d87c971
parent4bd181fb5abc4c85e4f097262d36a409258b1561
parent80d094f07272663d759ec4bd8e8a8c233753dd46
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  add test case for ipv6 url parsing