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

Trivial merge