Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
authorJørgen Lind <jorgen.lind@nokia.com>
Thu, 4 Aug 2011 07:14:17 +0000 (09:14 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 4 Aug 2011 07:14:17 +0000 (09:14 +0200)

Trivial merge