Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor
authorJørgen Lind <jorgen.lind@nokia.com>
Fri, 10 Jun 2011 11:35:10 +0000 (13:35 +0200)
committerJørgen Lind <jorgen.lind@nokia.com>
Fri, 10 Jun 2011 11:35:10 +0000 (13:35 +0200)

Trivial merge