Merge proposals

gnome-pilot-conduits has no merge proposals.