Merge "Merge branch 'master' into refactor" into refactor
authorGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 25 Aug 2011 10:50:29 +0000 (12:50 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 25 Aug 2011 10:50:29 +0000 (12:50 +0200)

Trivial merge