Merge remote-tracking branch 'ajax/xserver-next'
authorKeith Packard <keithp@keithp.com>
Fri, 4 Oct 2013 20:50:04 +0000 (13:50 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 4 Oct 2013 20:50:04 +0000 (13:50 -0700)
1  2 
damageext/damageext.c

Simple merge