Merge "Merge commit 'qt-v5.0.0-alpha1'" into refs/staging/master
authorLars Knoll <lars.knoll@nokia.com>
Thu, 12 Apr 2012 10:05:58 +0000 (12:05 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 12 Apr 2012 10:32:06 +0000 (12:32 +0200)

Trivial merge