[sssd/f16: 5/5] Merge branch 'master' into f16

[Stephen Gallagher]

commit 5f6282390d723be7753a31e0e23e881016d9a308
Merge: 4fac5d3 50d0fe5
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Nov 10 12:20:00 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	sssd.spec

 ...ix-removing-in-old-domain-when-saving-a-n.patch |   35 ++++++++++++++++++++
 sssd.spec                                          |   27 ++++++++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)
---