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

[Hans de Goede]

commit a03e0b686d9e0220877fba1d123b6a5b313e1304
Merge: dcde8d0 fbbe8e1
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu May 2 11:01:41 2013 +0200

    Merge remote-tracking branch 'origin/master' into f18
    
    Conflicts:
    	libgphoto2.spec

 libgphoto2-ptp-usb3.patch |   19 +++++++++
 libgphoto2.spec           |   99 +++++++++++++++++++++++----------------------
 2 files changed, 69 insertions(+), 49 deletions(-)
---