0d522fa Merge branch 'f20'

Merged and Committed by twaugh 10 years ago
    Merge branch 'f20'
    
    Conflicts:
    	libgphoto2.spec
    
        
file modified
+5 -2