[389-ds-base/f13/master] fix more git merge problems

[Richard Allen Megginson]

commit 5a82039d00e135414e832357095bd9b45d984e43
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Oct 27 17:56:07 2010 -0600

    fix more git merge problems

 389-ds-base.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 8745cd3..35594d4 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -14,7 +14,7 @@
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.7
-Release:          %{?relprefix}5%{?prerel}%{?dist}
+Release:          %{?relprefix}6%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -365,6 +365,12 @@ end
 %{_datadir}/%{pkgname}-selinux
 
 %changelog
+* Wed Oct 27 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.7-0.6.a3
+- fix more git merge problems
+
+* Wed Oct 27 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.7-0.5.a3
+- fix git merge problems
+
 * Wed Oct 27 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.7-0.4.a3
 - 1.2.7.a3 release - a2 was never released - this is a rebuild to pick up
 - Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs