[libgphoto2/f18: 2/2] Merge remote-tracking branch 'origin/master' into f18

[Hans de Goede]

commit da03dd47e671648e3bbd6a8460f796f3dad30a57
Merge: a03e0b6 9f45899
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat May 4 11:32:00 2013 +0200

    Merge remote-tracking branch 'origin/master' into f18

 libgphoto2-ptp-crash-on-no-card.patch |   17 +++++++++++++++++
 libgphoto2.spec                       |    7 ++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---