Merge branch 'sharemodes-bug560' into branch-netatalk-3-1

diff --cc NEWS
index 9996fec0d02531640c6fafbfe09c48ffd33454c0,22b43072739b8cbc2a417e7e720ce6f1d4feea01..b38b278cfc07c798659f6af45ac7199c321c0f8a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -3,7 -3,7 +3,8 @@@ Changes in 3.1.
  * FIX: Option "vol dbpath" was broken in 3.1.1
  * FIX: Spotlight: file modification date, bug #545
  * FIX: Improve reliability of afpd child handler
 +* FIX: debian initscript: add 0 and 6 to Default-Stop. debian-bug#745520
+ * FIX: put the Solaris share reservation after our locking stuff, bug #560.
  
  Changes in 3.1.1
  ================