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

[Richard Allen Megginson]

commit b37a20ff6040e934bb6573e884e93e48960734cd
Merge: 28ee6cd 028e0e9
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Aug 26 15:43:23 2010 -0600

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

 .gitignore             |    2 +-
 389-admin-git-local.sh |    2 +-
 389-admin-git.sh       |    2 +-
 389-admin.spec         |    9 ++++++---
 sources                |    2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)
---
diff --cc 389-admin.spec
index a82086f,e997154..7bc46c1
--- a/389-admin.spec
+++ b/389-admin.spec
@@@ -217,7 -217,10 +217,10 @@@ en
  %{_mandir}/man8/*
  
  %changelog
+ * Thu Aug 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-1
+ - This is the final 1.1.11 release
+ 
 -* 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