Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
authorLars Knoll <lars.knoll@nokia.com>
Tue, 12 Jul 2011 14:11:03 +0000 (16:11 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 12 Jul 2011 14:11:03 +0000 (16:11 +0200)

Trivial merge