Reflect latest round of changes from HEAD

Ready for release?

CHANGES

@@ -6,12 +6,13 @@ OpenLDAP 2.1.10 Engineering
 	Fixed slapd empty oid control bug
 	Fixed slapd NameAndOptionalUID bug
 	Fixed slapd reentant gethostbyname bug
+	Fixed slapd SASL/EXTERNAL handling
 	Fixed ldapsearch empty baseObject bug
 	Fixed libldap_r thread stack size
-	Updated slapd to use data ready loop
+	Fixed libldap SASL/EXTERNAL handling
 	Updated ldapdelete/ldapmodrdn continue error handling
 	Added back-bdb IDL slab cache  (ITS#2183)
-	Removed lint
+	Removed lint, etc.
 
 OpenLDAP 2.1.9 Release
 	Fixed back-bdb moddn newSuperior bug