Merge commit 'v2.6.30.4' into zygo-2.6.30.4-zb64

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