Merge "Merge branch 'release' into stable" into refs/staging/stable stable_1371990388
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Sun, 23 Jun 2013 12:17:44 +0000 (14:17 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sun, 23 Jun 2013 12:17:44 +0000 (14:17 +0200)

Trivial merge