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

diff --cc Makefile
index 2b335c58beab86ae2d82dea5f7892ab2e65d160a,4ebf57a4d6e9e746e618c0617a10932831928e23..b06c78b56fff9896700b69164eaff881a2377ebc
--- 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)-zb5u
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README