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

[Stephen Gallagher]

commit 29deb0be3ad6c9238ac670e99327ef17cafcb5c9
Merge: a756369 2d631b3
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Oct 4 09:49:39 2010 -0400

    Merge branch 'master' into f13

 sssd.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---