Merge commit 'v2.6.30.7' into zygo-2.6.30.7-zb5s

diff --cc Makefile
index c6352554d25a12b660c27f9efbd0d4820eb1d319,4ebf57a4d6e9e746e618c0617a10932831928e23..b02546e444a3a0b84b7e83d0d22805d2df14fcc1
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 30
- EXTRAVERSION = .6
+ EXTRAVERSION = .7
  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