Merge commit 'v2.6.29.2' into zygo-2.6.29.2-zb5s

diff --cc Makefile
index 8981a8b78c56fde847eb5a942aab1bc02f6e5050,0380c7e4f70af91df56d4e4b8d7e9b0923773fbc..ff8a036b3dea57158c8c16814654b152bc4810e6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 29
- EXTRAVERSION = .1
+ EXTRAVERSION = .2
  NAME = Temporary Tasmanian Devil
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb5s
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README