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

[Richard Allen Megginson]

commit 088ea92eef4ceb56e2bc553aec9fadb16b2cff5f
Merge: 7bfb831 5306a69
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Fri Oct 22 20:34:48 2010 -0600

    Merge branch 'f13' into f12

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