Update to latest

COPYRIGHT

@@ -7,11 +7,14 @@ Public License.  A copy of this license is available at
 http://www.OpenLDAP.org/license.html or in file LICENSE in the
 top-level directory of the distribution.
 
-Individual files and/or contributed packages may contain material
-copyright by other parties and use subject to additional restrictions.
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+Individual files and/or contributed packages may be copyright by
+other parties and subject to additional restrictions.
 
 This work is derived from the University of Michigan LDAP v3.3
-software <http://www.umich.edu/~dirsvcs/ldap/>.
+distribution.  Information concerning this software is available
+at: http://www.umich.edu/~dirsvcs/ldap/
 
 This work also contains materials derived from public sources.
 
@@ -32,6 +35,3 @@ to the University of Michigan at Ann Arbor. The name of the University
 may not be used to endorse or promote products derived from this
 software without specific prior written permission. This software
 is provided ``as is'' without express or implied warranty.
-
----
-$OpenLDAP$