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

[Nalin Dahyabhai]

commit 96d17196a3b39e351746d229746718bfb617b622
Merge: 2598de5 f60e9ef
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Fri Jun 22 14:24:31 2012 -0400

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

 krb5-trunk-pkinit-anchorsign.patch |   40 ++++++++++++++++++++++++++++++++++++
 krb5.spec                          |    9 +++++++-
 2 files changed, 48 insertions(+), 1 deletions(-)
---