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

[Nalin Dahyabhai]

commit 420f11337ff10e725c67ecfc5be4e4442b62c82c
Merge: 96d1719 718a157
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Tue Jul 31 14:26:22 2012 -0400

    Merge remote-tracking branch 'origin/master' into f17

 2012-001-patch.txt |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 krb5.spec          |   31 +++++++++++++++++++++++---
 2 files changed, 88 insertions(+), 4 deletions(-)
---