Sync with HEAD

diff --cc CHANGES
index eb23eca630a4f8510efd9f7784ef7d8050700739,0000000000000000000000000000000000000000..dd26f9406d4e59bf51663d06ec28264a97da08df
mode 100644,000000..100644
--- 1/CHANGES
--- /dev/null
+++ b/CHANGES
@@@ -1,5 -1,0 +1,5 @@@
- OpenLDAP 2.4.2alpha Release
 +OpenLDAP 2.4 Change Log
 +
++OpenLDAP 2.4.3alpha Engineering
 +      Changes not tracked
 +

diff --cc build/version.var
index c34d625022b3fdddd49ec5843cb38b7d23c7b742,594a105eb17a1c02dab2177def8ab0443684be2e..5a6a77d5ccee84579b50bbb5a922d7ff5f042c2f
--- 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=2alpha
+ 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=20402
 +ol_api_current=1
 +ol_api_revision=1
 +ol_api_age=1
 +ol_release_date="2006/05/17"

diff --cc configure
index 8f4964e5c038d78b52f83a442b821646fd2e1360,43694150d6eb7e845c7ef8b10bf6d2d67af51a3e..00f8fbf4b985116d51afe4005be75c0d0f0d7626
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,5 -1,5 +1,5 @@@
  #! /bin/sh
- # From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.633 2006/04/29 08:09:31 hyc Exp .
 -# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.635 2006/07/26 00:55:07 hyc Exp .
++# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.631.2.2 2006/05/15 17:04:37 kurt Exp .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.59.
  #