Merge branch 'refactor' of scm.dev.nokia.troll.no:qt-compositor/mainline into refactor
authorAndy Nichols <andy.nichols@nokia.com>
Wed, 31 Aug 2011 14:25:36 +0000 (16:25 +0200)
committerAndy Nichols <andy.nichols@nokia.com>
Wed, 31 Aug 2011 14:25:36 +0000 (16:25 +0200)

Trivial merge