[mod_auth_kerb/f17: 5/5] Merge branch 'master' into f17

[jorton]

commit 87d22fe3b89d479192f61bc67048ad1a0f6037fe
Merge: 94f15c2 7954e0c
Author: Joe Orton <jorton at redhat.com>
Date:   Fri May 11 12:28:56 2012 +0100

    Merge branch 'master' into f17

 mod_auth_kerb-5.4-cachedir.patch |    4 ++--
 mod_auth_kerb.spec               |   19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)
---