Merge commit 'v2.6.31.11' into zygo-2.6.31.11-zb5u

diff --cc Makefile
index 3a9de9727f8fe98fd6635701ae7e2d972ea1b8a0,c66c16718220bc614506618646af58213d4cbd98..9dc252b600bf5a388b5314ac70e1be9ee9ac246f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 31
- EXTRAVERSION = .9
+ EXTRAVERSION = .11
  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