Merge "Merge remote-tracking branch 'origin/dev' into stable" into refs/staging/stable
authorJ-P Nurmi <jpnurmi@digia.com>
Fri, 22 Mar 2013 15:31:39 +0000 (16:31 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 22 Mar 2013 16:07:22 +0000 (17:07 +0100)

Trivial merge