Merge branch-2-1

diff --cc NEWS
index 8dc424db0990e43164406d9bfc8c71f07e9bc64c,24306f34f4445c40dd199c5863d5943631e93954..3d56a87832eaba3e7328ff6633fcdd9eaed1319d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,13 -1,8 +1,18 @@@
 +Changes in 2.2
 +==============
 +
 +* UPD: AppleTalk are disabled by configure script. if use, --enable-ddp.
 +* NEW: afpd: dynamic directoy cache
 +* NEW: afpd: POSIX 1e ACL support
 +* NEW: afpd: automagic Zeroconf registration with avahi, registering both
 +       the service _afpovertcp._tcp and TimeMachine volumes with _adisk._tcp.
 +* UPD: Support for BerkeleyDB 5.0.
 +
+ Changes in 2.1.3
+ ================
+ 
+ * FIX: afpd: fix a serious error in networking IO code
+ 
  Changes in 2.1.2
  ================