Merge "Merge commit 'qt-v5.0.0-alpha1'" into refs/staging/master
authorRohan McGovern <rohan.mcgovern@nokia.com>
Thu, 12 Apr 2012 02:15:02 +0000 (04:15 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 12 Apr 2012 02:15:02 +0000 (04:15 +0200)

Trivial merge