Merge commit 'v2.6.39.4' into zygo-2.6.39.4-zb5s

diff --cc Makefile
index 31b3930d2e54560633427473c717df4705e5756b,1b2a736584b06dba70e5a1274253983699483448..7ffac7174b5578e90f5fdbc73e0677b8994a6444
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 39
- EXTRAVERSION = .3
+ EXTRAVERSION = .4
  NAME = Flesh-Eating Bats with Fangs
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb5s
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README