[slapi-nis/f13/master: 3/3] Merge branch 'master' into f13

[Nalin Dahyabhai]

commit 4612cb12e7be23630330080c91e6d6f744089de3
Merge: 58d9b4d e73f356
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Wed Apr 6 16:03:09 2011 -0400

    Merge branch 'master' into f13

 .gitignore     |    1 +
 slapi-nis.spec |    9 ++++++++-
 sources        |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---