Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Feb 2013 10:32:17 +0000 (11:32 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 26 Feb 2013 10:32:17 +0000 (11:32 +0100)

Trivial merge