Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 25 Jun 2013 21:29:59 +0000 (23:29 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 25 Jun 2013 23:02:37 +0000 (01:02 +0200)

Trivial merge