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

[Stephen Gallagher]

commit 0652a3507cbb1bf059e7a83f19092e64d89ec5a8
Merge: 1d5ea15 8c71823
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Mar 12 19:27:34 2012 -0400

    Merge branch 'master' into f17

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