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

[Richard Allen Megginson]

commit 0e1393e4edb5182f621860dde6f478f7fa293f48
Merge: cde55f4 b5f6fe3
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:06:12 2010 -0600

    Merge branch 'master' into f12

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