Merge commit 'qt-v5.0.0-alpha1'
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>
Wed, 11 Apr 2012 17:56:11 +0000 (12:56 -0500)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>
Wed, 11 Apr 2012 18:14:11 +0000 (13:14 -0500)
Change-Id: I5af4b98754ede311bfd4b2f9c77d76096447ea62


Trivial merge