Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 5 Jun 2013 13:10:58 +0000 (15:10 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 5 Jun 2013 13:46:54 +0000 (15:46 +0200)

Trivial merge