Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor
authorJørgen Lind <jorgen.lind@nokia.com>
Wed, 1 Jun 2011 14:00:16 +0000 (16:00 +0200)
committerJørgen Lind <jorgen.lind@nokia.com>
Wed, 1 Jun 2011 14:00:16 +0000 (16:00 +0200)

Trivial merge