Merge sf

diff --cc NEWS
index 20d4da9d970cc996109b6d47ea092928ee36964e,60acfbcd099d2ce0d9c7e042ed289d8077b23b88..e096cad84061c7ed28de36e3521ebb181a5acb90
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,30 -1,6 +1,31 @@@
 +Changes in 2.2.1
 +================
 +
 +* FIX: cnid_dbd: increase BerkeleyDB locks and lockobjs
 +* FIX: afpd: increase BerkeleyDB locks and lockobjs
++* FIX: suse: initscript return better status
 +
 +Changes in 2.2
 +==============
 +
 +* NEW: afpd: new volume option "nonetids"
 +* NEW: afpd: ACL access check caching
  * NEW: afpd: FCE event notifications
  * NEW: afpd: new option "-mimicmodel" for specifying Bonjour model registration
 -* FIX: suse: initscript return better status
 +* UPD: Support for Berkeley DB 5.1
 +* UPD: case-conversion is based on Unicode 6.0.0
 +* UPD: cnid_metad: allow up to 4096 volumes
 +* UPD: afpd: only forward SIGTERM and SIGUSR1 from parent to childs
 +* UPD: afpd: use internal function instead of popening du -sh in order to
 +       calculate the used size of a volume for option "volsizelimit"
 +* UPD: afpd: Add negative UUID caching, enhance local UUID handling
 +* FIX: afpd: configuration reload with SIGHUP
 +* FIX: afpd: crashes in the dircache
 +* FIX: afpd: Correct afp logout vs dsi eof behaviour
 +* FIX: afpd: new catsearch was broken
 +* FIX: afpd: only use volume UUIDs in master afpd
 +* FIX: dbd: Multiple fixes, reliable locking
 +* FIX: ad file suite: fix an error that resulted in CNID database inconsistencies
  
  Changes in 2.2beta4
  ===================