Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase qt-v5.0.0-alpha1
authorSimo Fält <simo.falt@nokia.com>
Thu, 29 Mar 2012 10:35:50 +0000 (13:35 +0300)
committerSimo Fält <simo.falt@nokia.com>
Thu, 29 Mar 2012 10:35:50 +0000 (13:35 +0300)

Trivial merge