Merge "Merge remote branch 'gerrit/master' into HEAD" into refactor
authorPaul Olav Tvete <paul.tvete@nokia.com>
Tue, 6 Sep 2011 09:08:48 +0000 (11:08 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 6 Sep 2011 09:08:48 +0000 (11:08 +0200)

Trivial merge