Merge commit 'v2.6.31.6' into zygo-2.6.31.6-zb64

diff --cc Makefile
index 3f2b478a9e82860279b97774ecdcb6944a963cd7,32ec7005a676dea6fcb9d115d1f320aab324f5a1..2d08fce5c2c660fcd5d467aa823e738783351fe9
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 31
- EXTRAVERSION = .5
+ EXTRAVERSION = .6
  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