Merge remote-tracking branch 'qt-mainline/4.8'
authoraavit <qt-info@nokia.com>
Thu, 22 Sep 2011 09:02:18 +0000 (11:02 +0200)
committeraavit <qt-info@nokia.com>
Thu, 22 Sep 2011 09:02:18 +0000 (11:02 +0200)
commit1b215938323d42276efcf8c293c5da66dca7c76a
tree059b57324eb56bc8f403dbb05bbbb447f2212f52
parent128c4166ba445112ab73dd98b3e403da0489656e
parent085bd7cf2d76f9acd548120f859201b014970a72
Merge remote-tracking branch 'qt-mainline/4.8'

Conflicts:
dist/changes-4.8.0
dist/changes-4.8.0