Merge ../mlt
[melted] / src / modules / xine / gpl