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

[Richard Allen Megginson]

commit 8693b03e2f590625be3b093a4d53c7f472955dac
Merge: 42c56f1 c5368dc
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Mon Sep 27 15:32:05 2010 -0600

    Merge branch 'master' into f13

 389-ds-base.spec |    5 +++++
 sources          |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc 389-ds-base.spec
index e57e904,c646bd4..695c38d
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -348,11 -349,13 +348,16 @@@ en
  
  %changelog
  * Thu Sep 23 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-1
+ - This is the 1.2.6.1 release - git tag 389-ds-base-1.2.6.1
  - Bug 634561 - Server crushes when using Windows Sync Agreement
+ - Bug 635987 - Incorrect sub scope search result with ACL containing ldap:///self
+ - 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
  
 +* 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
 +
  * Thu Aug 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-1
  - This is the final 1.2.6 release