From: Qt Continuous Integration System <qt-info@nokia.com>
Date: Fri, 20 May 2011 10:36:27 +0000 (+1000)
Subject: Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
X-Git-Tag: qt-v5.0.0-alpha1~4279
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49cf3e27e2b63ca799d5fb8478673d4c92ff2995;p=profile%2Fivi%2Fqtbase.git

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
---

49cf3e27e2b63ca799d5fb8478673d4c92ff2995