Merge proposals

libdvbpsi in Ubuntu has no merge proposals.