2691bbc Merge branch 'f17' into f16

Merged and Committed by limb 12 years ago
    Merge branch 'f17' into f16
    
    Conflicts:
    	pidgin.spec
    
        
file modified
+1 -0
file modified
+30 -9
file added
+2476
file modified
+1 -1