Sync in Marcus changes in libgphoto2
5 files changed