Merge branch 'master' of git://scm.dev.nokia.troll.no/qt-compositor/mainline
authorGunnar Sletta <gunnar.sletta@nokia.com>
Fri, 15 Apr 2011 14:16:59 +0000 (16:16 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Fri, 15 Apr 2011 14:16:59 +0000 (16:16 +0200)

Trivial merge