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

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