[krb5/f17: 13/14] Merge remote-tracking branch 'origin/master' into f17

[Nalin Dahyabhai]

commit 1c3aace857b9a734c24a13b452c4f8d4146a214b
Merge: 1d265fd 16a5c7a
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Wed Jun 13 18:15:22 2012 -0400

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	krb5.spec

 .gitignore                                         |    6 +
 krb5-1.10-crashfix.patch                           |   39 ---
 krb5-1.10-lookaside.patch                          |  101 ------
 krb5-1.10-string-rpc-acl-fix.patch                 |   61 ----
 krb5-1.10.2-keytab-etype.patch                     |  332 ++++++++++++++++++++
 ...10-manpaths.patch => krb5-1.10.2-manpaths.patch |    2 +-
 krb5-1.10-pam.patch => krb5-1.10.2-pam.patch       |    6 +-
 ...-label.patch => krb5-1.10.2-selinux-label.patch |    6 +-
 krb5.spec                                          |   81 ++++--
 sources                                            |    6 +-
 10 files changed, 403 insertions(+), 237 deletions(-)
---