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)
commitc3631ff684b47208b351f420b6d571f3326c0351
treebd42f171ddfd497f1033b897cd8c07fcce3c3d3d
parent81c5d1317d450b9e882e9d5cf112077e7a3fe5ba
parentf5b08ea9254c834d67c3c49fdb4d9b55a175a687
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt-compositor/mainline