commit 52418ea48fdfdaadf598cf927b7c7f89f3f8c230 Merge: 420f113 899e166 Author: Nalin Dahyabhai <nalin at redhat.com> Date: Tue Jul 31 14:36:09 2012 -0400 Merge remote-tracking branch 'origin/master' into f17 krb5.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---