[sssd/f18: 6/6] Merge branch 'master' into f18

[Stephen Gallagher]

commit 7a038fb3e2a83371093add7d3f5e11c611154d2b
Merge: 37b48b9 b19546a
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Thu Aug 30 13:49:01 2012 -0400

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

 sssd.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---