Merge "Merge branch 'newdocs'" into refs/staging/master
authorSamuel Rødal <samuel.rodal@digia.com>
Tue, 20 Nov 2012 11:16:16 +0000 (12:16 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 20 Nov 2012 13:13:07 +0000 (14:13 +0100)

Trivial merge