Merge "Merge branch 'release' into stable" into refs/staging/stable
authorGunnar Sletta <gunnar.sletta@digia.com>
Thu, 17 Jan 2013 21:48:20 +0000 (22:48 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 17 Jan 2013 21:48:20 +0000 (22:48 +0100)

Trivial merge