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

[Richard Allen Megginson]

commit 5b522724f7055688fbfc13e54a889b03bc24fef5
Merge: 0d4a4b1 d5673eb
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Sep 23 14:30:24 2010 -0600

    Merge branch 'master' into el6

 .gitignore               |    2 +-
 389-ds-base-devel.README |    1 -
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |    5 ++++-
 sources                  |    2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
---