fe0b317 Merge remote-tracking branch 'origin/f15/master' into f14/master

Merged and Committed by rdieter 13 years ago
    Merge remote-tracking branch 'origin/f15/master' into f14/master
    
    Conflicts:
    	exiv2.spec
    
        
file modified
+1 -1
file removed
-171
file removed
-37
file modified
+15 -18
file modified
+1 -1