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

[Richard Allen Megginson]

commit cbbebc3916d749faec33745c569add503f049fe9
Merge: 34c76e9 541ff87
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Aug 4 10:34:55 2010 -0600

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

 .gitignore               |    3 ++-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   18 ++++++++++++++++--
 sources                  |    2 +-
 5 files changed, 21 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 30216f5,edba661..5d85e94
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
--389-ds-base-1.2.6.rc3.tar.bz2
 -*~
+ 389-ds-base-1.2.6.rc6.tar.bz2
++*~