[sssd/f15/master: 3/3] Merge remote-tracking branch 'origin/master' into f15

[Stephen Gallagher]

commit 99c9bb5b80f67331e639e76242f4062d3a36e694
Merge: 565c007 d9b22a7
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Wed Apr 20 12:50:31 2011 -0400

    Merge remote-tracking branch 'origin/master' into f15
    
    Conflicts:
    	sssd.spec

 0004-Always-generate-kpasswdinfo-file.patch |   28 +++++++++++++++++++++++++++
 sssd.spec                                   |   20 ++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)
---