[389-admin/f12/master: 26/26] Merge branch 'f13' into f12

[Richard Allen Megginson]

commit 5ac7ba5325fd6569079bd28cbde712900379dad9
Merge: 0709227 28ee6cd
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Aug 4 11:23:30 2010 -0600

    Merge branch 'f13' into f12
    
    Conflicts:
    
    	.gitignore
    	389-admin-git-local.sh
    	389-admin-git.sh
    	389-admin.spec
    	sources

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