Merge commit 'v2.6.30.5' into zygo-2.6.30.5-zb64

diff --cc Makefile
index 66be49a4ba01da3e5d03fb752f88eb00c4d89c79,ad9c9b0718e5bd8adb89ff943ddd54d82ecd0436..3c339874f561f8b135dbd3c544b5c46ff8a3f9f7
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 30
- EXTRAVERSION = .4
+ EXTRAVERSION = .5
  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