Merge remote-tracking branch 'bnf/fixes-2'
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 21 Jun 2011 15:31:38 +0000 (11:31 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 21 Jun 2011 15:31:38 +0000 (11:31 -0400)
commit2468692c9f375732b38fa14db8b02c4643277507
tree1826c8903d03fb5630f3bc28fa23bb46cb4c191f
parent8f0ce05f527cf2b09307318c4d925970392f68f3
parentfb4b5a293abf02b86f3521f71e6291abad2d1401
Merge remote-tracking branch 'bnf/fixes-2'
compositor/compositor.c