Merge commit 'v2.6.36.4' into zygo-2.6.36.4-zb5u

diff --cc Makefile
index 0f93c580495d9b4c128ceb99cae6561fbd0f5a9f,d831b481c0e88c4a4c74b588660ad5784131bd11..910bc6073f1923873d3f42fc264df1b778f67a2e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 36
- EXTRAVERSION = .3
+ EXTRAVERSION = .4
  NAME = Flesh-Eating Bats with Fangs
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb5u
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README