Merge branch-2-1

diff --cc NEWS
Simple merge

diff --cc bin/misc/uuidtest.c
index 524e25b7a138b8d9e4fc6a3775efa0a15581d897,77a7fa793bfb744b276ebb1313f076d454659076..cb9177edd7e26e8c758076447307ba2987c050e9
--- 1/bin/misc/uuidtest.c
--- 2/bin/misc/uuidtest.c
+++ b/bin/misc/uuidtest.c
@@@ -68,7 -68,8 +68,8 @@@ int main( int argc, char **argv
  {
      int ret, i, c;
      int verbose = 0;
 -    uuid_t uuid;
 +    atalk_uuid_t uuid;
+     int logsetup = 0;
      uuidtype_t type;
      char *uuidstring = NULL;
      char *name = NULL;

diff --cc etc/afpd/acls.c
Simple merge

diff --cc etc/afpd/directory.c
index b658ad1d56995528333101dbc032bb41c3f00fe5,61339b0882d164c1b4a4dc07ec139e04f2c81ae1..e8cc7f611e798613a11f8f4646b5fe67c73f7dca
--- 1/etc/afpd/directory.c
--- 2/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@@ -1,8 -1,9 +1,6 @@@
  /*
-  * $Id: directory.c,v 1.140 2010/03/12 15:16:49 franklahm Exp $
-  *
   * Copyright (c) 1990,1993 Regents of The University of Michigan.
   * All Rights Reserved.  See COPYRIGHT.
 - *
 - * 19 jan 2000 implemented red-black trees for directory lookups
 - * (asun@cobalt.com).
   */
  
  #ifdef HAVE_CONFIG_H

diff --cc include/atalk/uuid.h
Simple merge

diff --cc libatalk/acl/cache.c
Simple merge

diff --cc libatalk/vfs/acl.c
Simple merge