[slapi-nis/f13/master: 2/2] Merge remote branch 'origin/master' into f13/master

[Nalin Dahyabhai]

commit 58d9b4d42a7f38feb5534d274a330ec76a16bbd9
Merge: fb23b33 ffe3123
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Jan 6 12:14:01 2011 -0500

    Merge remote branch 'origin/master' into f13/master

 .gitignore     |    1 +
 slapi-nis.spec |   20 +++++++++++++++++---
 sources        |    2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)
---