6d5c41d Merge remote-tracking branch 'origin/master' into f15/master

Merged and Committed by Nalin Dahyabhai 12 years ago
    Merge remote-tracking branch 'origin/master' into f15/master
    
    Conflicts:
    	krb5-klist_s.patch
    	krb5.spec
    
        
file modified
+3 -0
file removed
-19
file removed
-126
file modified
+12 -0
file modified
+54 -7
file modified
+22 -7
file modified
+78 -20
file modified
+3 -0