Merge branch 'el5' into el4

Conflicts:

	.gitignore

.gitignore

@@ -1 +1 @@
-389-adminutil-1.1.8.tar.bz2
+389-adminutil-1.1.11.tar.bz2

389-adminutil.spec

@@ -1,7 +1,7 @@
 Summary:          Utility library for 389 administration
 Name:             389-adminutil
-Version:          1.1.8
-Release:          4%{?dist}
+Version:          1.1.11
+Release:          1%{?dist}
 License:          LGPLv2
 URL:              http://port389.org/wiki/AdminUtil
 Group:            Development/Libraries
@@ -82,6 +82,17 @@ that use %{name}.
 %{_includedir}/libadmsslutil
 
 %changelog
+* Tue Oct 19 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-1
+- the 1.1.11 release
+
+* Fri Feb 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.10-1
+- Bug 460168 - FedoraDS' adminutil requires non-existent "icu.pc" on non-RH/Fedora systems
+- this is the 1.1.10 release
+
+* Thu Jan 14 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.9-1
+- make sure we can find ICU genrb on all platforms
+- this is the 1.1.9 release
+
 * Wed Aug 12 2009 Rich Megginson <rmeggins@redhat.com> - 1.1.8-4
 - final 1.1.8 release
 

sources

@@ -1 +1 @@
-f1b0884c701e3cc7705224e07d088d8e  389-adminutil-1.1.8.tar.bz2
+c772dc3fee1736798dd966ca847793d4  389-adminutil-1.1.11.tar.bz2