[sssd/f15: 2/2] Merge branch 'master' into f15

[Stephen Gallagher]

commit 26e1b5526712fba0705ef639960b76a4b8818916
Merge: 91149e7 ce222ba
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jul 5 15:04:35 2011 -0400

    Merge branch 'master' into f15

 .gitignore |    1 +
 sources    |    2 +-
 sssd.spec  |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
---