Merge commit 'v2.6.31.7' into zygo-2.6.31.7-zb64

diff --cc Makefile
index 2d08fce5c2c660fcd5d467aa823e738783351fe9,2e405c89e92dd4ab9c2094aea8b1bc7796f7bce5..220ae6090e5edc07307b8e1894e850ee600b08ac
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 31
- EXTRAVERSION = .6
+ EXTRAVERSION = .7
  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