[389-ds-base: 17/17] Merge branch 'f14'

[Richard Allen Megginson]

commit 5143f1e89c4dae8f1bf7ca8a4674027f5ba50a3c
Merge: 02e869f 6fa7afc
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Aug 10 08:43:16 2010 -0600

    Merge branch 'f14'
    
    Conflicts:
    
    	.gitignore
    	389-ds-base-git-local.sh
    	389-ds-base-git.sh
    	389-ds-base.spec
    	sources

 .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, 11 insertions(+), 6 deletions(-)
---