Merge "Merge branch 'dev' into stable" into refs/staging/stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 22 Mar 2013 12:16:59 +0000 (13:16 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 22 Mar 2013 12:16:59 +0000 (13:16 +0100)

Trivial merge