Quick merge: everything from HEAD

diff --cc CHANGES
index 4f640b4f8a3c23f2b1e24a24b89273269a032a66,0000000000000000000000000000000000000000..dc456dd4f160c490c7dba867a99d88f9c3b49989
mode 100644,000000..100644
--- 1/CHANGES
--- /dev/null
+++ b/CHANGES
@@@ -1,5 -1,0 +1,5 @@@
- OpenLDAP 2.4.3alpha Release
 +OpenLDAP 2.4 Change Log
 +
++OpenLDAP 2.4.4alpha Release
 +      Changes not tracked
 +

diff --cc README
Simple merge

diff --cc build/version.var
index 25ccabbdf7abd8a87c94c09dddd9acca9cfcc16c,131da34762ad962464fb2edaec9312a2441eafc6..7823dd7796ec87b35373083e34bfd74a18e30807
--- 1/build/version.var
--- 2/build/version.var
+++ b/build/version.var
@@@ -14,10 -14,10 +14,10 @@@
  ## <http://www.OpenLDAP.org/license.html>.
  ol_package=OpenLDAP
  ol_major=2
 -ol_minor=X
 +ol_minor=4
- ol_patch=3alpha
- ol_api_inc=20403
+ ol_patch=X
 -ol_api_inc=000000
 -ol_api_current=0
 -ol_api_revision=0
 -ol_api_age=0
 -ol_release_date="0000/00/00"
++ol_api_inc=20404
 +ol_api_current=1
- ol_api_revision=2
++ol_api_revision=3
 +ol_api_age=1
- ol_release_date="2006/08/22"
++ol_release_date="2006/10/20"

diff --cc configure
index 13edfa9a120f85be9cb73f98e7c7a54477b99c42,0ce7f34173cfaf6031374d5024d2f25bb1820686..204042d757591f6c670e52c0f7c852951d7400c0
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,5 -1,5 +1,5 @@@
  #! /bin/sh
- # From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.631.2.3 2006/08/17 23:50:21 kurt Exp .
 -# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.645 2007/01/19 01:54:44 kurt Exp .
++# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.631.2.4 2006/10/19 20:06:32 kurt Exp .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.59.
  #

diff --cc include/portable.hin
index ba3be72eb18a975f4f8f23fe40cbf15eac8dbe81,2f82be5d73b8e9aff5f9f8edecf94280f12718e3..b31e486f17c2a2dd83f59e693d5da530f13f87bf
--- 1/include/portable.hin
--- 2/include/portable.hin
+++ b/include/portable.hin
@@@ -463,7 -421,7 +421,7 @@@
  /* Define to 1 if you have the `pthread_kill_other_threads_np' function. */
  #undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP
  
--/* Define to 1 if you have the `pthread_rwlock_destroy' function. */
++/* define if you have pthread_rwlock_destroy function */
  #undef HAVE_PTHREAD_RWLOCK_DESTROY
  
  /* Define to 1 if you have the `pthread_setconcurrency' function. */