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

[jorton]

commit 5fadd09e52508859eed9584b4e1c1c68e04cb21d
Merge: 87d22fe 7ec72fb
Author: Joe Orton <jorton at redhat.com>
Date:   Wed Jun 13 16:13:09 2012 +0100

    Merge branch 'master' into f17

 mod_auth_kerb-5.4-cachedir.patch |    7 ++-----
 mod_auth_kerb.spec               |   20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 10 deletions(-)
---