01a1cc5 Merge branch 'master' into f16

Merged and Committed by Stu Tomlinson 12 years ago
    Merge branch 'master' into f16
    
    Conflicts:
    	pidgin.spec
    
        
file modified
+1 -0
file modified
+19 -1
file modified
+1 -1