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

[Richard Allen Megginson]

commit 26e52921af40c46290a707a8de4e1b09d4f366a5
Merge: 54390b4 6fa7afc
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Aug 10 08:28:25 2010 -0600

    Merge branch 'f14' into el6
    
    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(-)
---