Merge proposals

xine-lib has no merge proposals.