Merge commit 'v2.6.38.6' into zygo-2.6.38.6-zb5s

diff --cc Makefile
index 5240b8e65e4ae17b8f75e83828d66b220b8d966c,c74c308507ef792e6b050d72bb9c7460fd9d1bb6..acca54f812ebf53e20660b65aafc3013d9bc3faa
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 38
- EXTRAVERSION = .5
+ EXTRAVERSION = .6
  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