Merge commit 'v2.6.30.6' into zygo-2.6.30.6-zb5s

diff --cc Makefile
index ac7d52f69f69b240821b867f9b523fb63bee05f2,281ddff87cdcee4560049ec677f6f5608e2522e6..c6352554d25a12b660c27f9efbd0d4820eb1d319
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 30
- EXTRAVERSION = .5
+ EXTRAVERSION = .6
  NAME = Man-Eating Seals of Antiquity
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb5s
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README