6d5c41d
Merge remote-tracking branch 'origin/master' into f15/master Conflicts: krb5-klist_s.patch krb5.spec