[389-admin/f14/master: 6/7] Merge branch 'master' into f14

[Richard Allen Megginson]

commit 044ca653511250567fcb8a583c6b21aa8012a0e4
Merge: fca9e47 8ff78e5
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Nov 23 16:18:55 2010 -0700

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

 .gitignore             |    2 +-
 389-admin-git-local.sh |    2 +-
 389-admin-git.sh       |    2 +-
 389-admin.spec         |   16 ++++++++++++++--
 sources                |    2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 6a573b9,311e3bd..1a46d94
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,2 @@@
  *~
--389-admin-1.1.12.tar.bz2
+ /389-admin-1.1.13.tar.bz2
diff --cc 389-admin.spec
index e744683,6bfb2be..32b5d0e
--- a/389-admin.spec
+++ b/389-admin.spec
@@@ -171,9 -171,17 +171,21 @@@ en
  %{_mandir}/man8/*
  
  %changelog
+ * Tue Nov 23 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.13-1
+ - This is the final 1.1.13 release
+ - git tag 389-admin-1.1.13
+ - Bug 656441 - Missing library path entry causes LD_PRELOAD error
+ - setup-ds-admin.pl -u exits with ServerAdminID and as_uid related error
+ 
+ * Wed Nov 17 2010 Nathan Kinder <nkinder at redhat.com> - 1.1.1.12-2
+ - This is the final 1.1.12 release
+ - git tag 389-admin-1.1.12
+ 
  * Fri Nov 12 2010 Nathan Kinder <nkinder at redhat.com> - 1.1.1.12-1
 +- This is the final 1.1.12 release
 +- git tag 389-admin-1.1.12
++
++* Fri Nov 12 2010 Nathan Kinder <nkinder at redhat.com> - 1.1.1.12-1
  - Bug 648949 - Merge dirsrv and dirsrv-admin policy modules into base policy
  
  * Tue Oct 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.12-0.2.a2