Merge "Merge branch 'release' into stable" into refs/staging/stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 15:34:38 +0000 (16:34 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 31 Jan 2013 15:34:38 +0000 (16:34 +0100)

Trivial merge