Merge proposals

libgphoto2-bleeding has no merge proposals.