Merged: http://cgit.freedesktop.org/xorg/xserver/commit/include/servermd.h?id=ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be
Merged: http:// cgit.freedeskto p.org/xorg/ xserver/ commit/ include/ servermd. h?id=ab4b1fb38a 61feb73d8336cc7 a3399eb9d3d25be