Merge branch 'product-2-2' of git://github.com/franklahm/Netatalk into alex-master

* 'product-2-2' of git://github.com/franklahm/Netatalk:
  Configurable symlink behaviour
  Trying to create an EA that already existed returned the wrong AFP error code
  Add become_root() capability to nfsv4_chmod()
  Fix an error where catalog search gave incomplete results
  2.2.5dev
  Add missing source afp_asp.c
  Version 2.2.4

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

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