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

[Richard Allen Megginson]

commit 7595371b93d19aafc55562a02294656097aadc49
Merge: b5bb916 54c4422
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Fri Oct 22 20:31:35 2010 -0600

    Merge branch 'master' into f14

 .gitignore               |    2 +-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   11 +++++++++--
 sources                  |    2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)
---