[389-ds-base/el6/master: 4/6] Merge branch 'master' into el6

[Richard Allen Megginson]

commit c7e1760125cb2b8b9142ac8dfa69f5154c8e26bb
Merge: 26e5292 b5f6fe3
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:06:45 2010 -0600

    Merge branch 'master' into el6

 .gitignore               |    2 +-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |    9 ++++++---
 sources                  |    2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)
---