Merge branch 'master' of git://scm.dev.nokia.troll.no/qt-compositor/mainline
authorGunnar Sletta <gunnar.sletta@nokia.com>
Fri, 15 Apr 2011 05:12:56 +0000 (07:12 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Fri, 15 Apr 2011 05:12:56 +0000 (07:12 +0200)
commit405e5824b5b7906962fef12e84d034314b995c05
tree949a8a2de1ba0964180c2aed7b1843786f8dc5df
parent3ce3bc1bc650f9495cfd94555342c789171b0f62
parentc6d7687fe7a33432cc22a9f2ed47471fbf36f142
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt-compositor/mainline