[389-admin/el6/master: 13/13] Merge branch 'f13' into el6

[Richard Allen Megginson]

commit f6c846bf55a06c73566bf41e8143aff6e4e41a4d
Merge: 182aaa2 9a50eb2
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Oct 26 13:22:07 2010 -0600

    Merge branch 'f13' into el6

 .gitignore             |    2 +-
 389-admin-git-local.sh |    6 ++++--
 389-admin-git.sh       |    2 +-
 389-admin.spec         |   17 ++++++++++-------
 sources                |    2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)
---