Merge remote-tracking branch 'anholt/xserver-unifdef'
authorKeith Packard <keithp@keithp.com>
Wed, 22 Jan 2014 19:27:36 +0000 (11:27 -0800)
committerKeith Packard <keithp@keithp.com>
Wed, 22 Jan 2014 19:27:36 +0000 (11:27 -0800)

Trivial merge