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

[Richard Allen Megginson]

commit cde55f442f65551a6e4906164f8a03c5fd7801aa
Merge: cbbebc3 6fa7afc
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Aug 10 08:27:55 2010 -0600

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