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

[Richard Allen Megginson]

commit aa787a68dcd1f61aac1d3447ee43c22b6e70c6ad
Merge: 3a4827c 6fa7afc
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Aug 10 08:29:37 2010 -0600

    Merge branch 'f14' into el5
    
    Conflicts:
    
    	.gitignore

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