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

[Richard Allen Megginson]

commit 455fc89926d1927811108b9a0f011ebc1dbd30eb
Merge: b8d51ef 1c7c277
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Oct 20 09:17:36 2010 -0600

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

 .gitignore               |    2 +-
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   59 ++++++++++++++++++++++++++++++++-------------
 sources                  |    2 +-
 5 files changed, 46 insertions(+), 21 deletions(-)
---
diff --cc 389-ds-base.spec
index ce4b75d,b4e81a6..df87f49
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -358,6 -386,9 +386,12 @@@ en
  - Bug 612264 - ACI issue with (targetattr='userPassword')
  - Bug 606920 - anonymous resource limit- nstimelimit - also applied to "cn=directory manager"
  - Bug 631862 - crash - delete entries not in cache + referint
++<<<<<<< HEAD:389-ds-base.spec
++=======
+ 
+ * Wed Sep 22 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-2
+ - put back some of the selinux requires that I nuked during a git merge :P
++>>>>>>> f13:389-ds-base.spec
  
  * Thu Aug 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-1
  - This is the final 1.2.6 release