[krb5/master-f15-1.9: 2/2] Merge branch 'master-f15-1.9' of ssh://pkgs.fedoraproject.org/krb5 into master-f15-1.9

[Nalin Dahyabhai]

commit ee3bb042af587af5b4adfce84ce0ebd81fb02c7d
Merge: b5f2ca0 3515095
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Tue Nov 30 14:23:45 2010 -0500

    Merge branch 'master-f15-1.9' of ssh://pkgs.fedoraproject.org/krb5 into master-f15-1.9

 krb5.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---