commit b34aaa1ae6de50ceada51c116938b192ca3b2f63 Merge: 8abf5f2 3ec0939 Author: Matěj Cepl <mcepl at redhat.com> Date: Tue Apr 12 18:20:03 2011 +0200 Merge branch 'master' into el6 python-kerberos.spec | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) ---