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

[Richard Allen Megginson]

commit 540567449f259d91ff4425037005581504c88efb
Merge: 054a732 d5673eb
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Sep 23 14:29:12 2010 -0600

    Merge branch 'master' into f12

 .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(-)
---