Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor
authorLars Knoll <lars.knoll@nokia.com>
Wed, 6 Jul 2011 12:08:13 +0000 (14:08 +0200)
committerLars Knoll <lars.knoll@nokia.com>
Wed, 6 Jul 2011 12:08:13 +0000 (14:08 +0200)

Trivial merge