[shadow-utils/f16: 4/4] Merge remote-tracking branch 'origin/master' into f16

[Peter Vrabec]

commit 046c713cdf8d9dcc342e1258264a791b64d25716
Merge: 4f70021 22f8cbe
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Thu Nov 10 17:29:18 2011 +0100

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	shadow-utils.spec

 shadow-4.1.4.3-libsemanage.patch |  640 ++++++++++++++++++++++++++++++++++++++
 shadow-4.1.4.3-man.patch         |   13 +-
 shadow-utils.spec                |   14 +-
 3 files changed, 664 insertions(+), 3 deletions(-)
---