Merge proposals

xorgproto in Ubuntu has no merge proposals.