Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorJ-P Nurmi <jpnurmi@digia.com>
Tue, 9 Jul 2013 12:01:27 +0000 (14:01 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 9 Jul 2013 12:01:27 +0000 (14:01 +0200)

Trivial merge