Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorStephen Kelly <stephen.kelly@kdab.com>
Thu, 11 Apr 2013 13:09:39 +0000 (15:09 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 11 Apr 2013 13:09:39 +0000 (15:09 +0200)

Trivial merge