commit 7d964f7f053d359326d4e8d105e2d6975f242eaa Merge: 6ae4794 749bf2d Author: Stephen Gallagher <sgallagh at redhat.com> Date: Thu Jan 27 14:41:41 2011 -0500 Merge branch 'master' into f14 sssd.spec | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) ---