Merge commit 'v2.6.31.3' into zygo-2.6.31.1-zb5u

diff --cc Makefile
index 818ef4f25f319d4e076cfbe1623101af96cdb9a7,01385571d093ae6a2360d23ba9b0f79dbce7eb3c..182bfa1836b74345c351deb359b9e308a6afc02c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 31
- EXTRAVERSION = .1
+ EXTRAVERSION = .3
  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