[389-admin/el5/master: 16/16] Merge branch 'master' into el5

[Richard Allen Megginson]

commit fa954e1398178e99c7f2d9edb54b852704fe7989
Merge: ed00f21 c9f10df
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Aug 4 11:30:53 2010 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    
    	.gitignore
    	389-admin-git-local.sh
    	389-admin-git.sh
    	389-admin.spec
    	sources

 .gitignore             |    3 ++-
 389-admin-git-local.sh |    2 +-
 389-admin-git.sh       |    2 +-
 389-admin.spec         |    9 +++++++--
 sources                |    2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)
---
diff --cc 389-admin.spec
index 1d99b7a,fd3be8a..93c3640
--- a/389-admin.spec
+++ b/389-admin.spec
@@@ -9,7 -9,7 +9,7 @@@
  Summary:          389 Administration Server (admin)
  Name:             389-admin
  Version:          1.1.11
- Release:          %{?relprefix}5%{?prerel}%{?dist}
 -Release:          %{?relprefix}7%{?prerel}%{?dist}
++Release:          %{?relprefix}6%{?prerel}%{?dist}
  License:          GPLv2 and ASL 2.0
  URL:              http://port389.org/
  Group:            System Environment/Daemons
@@@ -219,13 -217,18 +219,18 @@@ en
  %{_mandir}/man8/*
  
  %changelog
 -* Wed Aug  4 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.7.rc2
++* Wed Aug  4 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.6.rc2
+ - 1.1.11.rc2 release
+ - git tag 389-admin-1.1.11.rc2
+ - Bug 594745 - Get rid of dirsrv_lib_t label
+ 
 -* Wed Jun  9 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.6.rc1
 +* Wed Jun  9 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.5.rc1
  - 1.1.11.rc1 release
  
 -* Wed May 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.5.a4
 +* Wed May 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.4.a4
  - 1.1.11.a4 release
  
 -* Tue Apr  7 2010 Nathan Kinder <nkinder at redhat.com> - 1.1.11-0.4.a3
 +* Tue Apr  7 2010 Nathan Kinder <nkinder at redhat.com> - 1.1.11-0.3.a3
  - 1.1.11.a3 release
  - Bug 570912 - dirsrv-admin SELinux module fails to install
  - Change parsing of start-slapd for instance name