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

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