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

[Richard Allen Megginson]

commit 42c56f18b9f84ea02df6cedc3c95bef76dd002c3
Merge: ef116cf d5673eb
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Sep 23 14:27:46 2010 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    
    	389-ds-base.spec

 .gitignore               |    2 +-
 389-ds-base-devel.README |    1 -
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |    7 +++++--
 sources                  |    2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)
---
diff --cc 389-ds-base.spec
index 66bb038,5727d1d..e57e904
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -347,9 -348,9 +347,12 @@@ en
  %{_datadir}/%{pkgname}-selinux
  
  %changelog
+ * Thu Sep 23 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-1
+ - Bug 634561 - Server crushes when using Windows Sync Agreement
+ 
 +* 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