commit 8556d005d28cbb394c9864d4fb15b2f23bb6911c Merge: 38da2f8 9a79ed0 Author: Stephen Gallagher <sgallagh at redhat.com> Date: Sun Oct 23 13:49:33 2011 -0700 Merge branch 'master' into f16 Conflicts: sssd.spec sssd.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) ---