Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorStephen Kelly <stephen.kelly@kdab.com>
Wed, 13 Mar 2013 16:12:28 +0000 (17:12 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 13 Mar 2013 16:12:28 +0000 (17:12 +0100)

Trivial merge