Merge branch 'zygo' into zygo-eeepc

Conflicts:

	Makefile

diff --cc Makefile
index f62da4fc844c457c1458726585ab3985f0710ead,ec864146f328e418e7afc51fb4bc6de910968043..b99184516d60ece355c701076d4ad55cccca1da6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 24
- EXTRAVERSION = .3-zbeee-toi
 -EXTRAVERSION = .4-zb5s-toi
++EXTRAVERSION = .4-zbeee-toi
  NAME = Err Metey! A Heury Beelge-a Ret!
  
  # *DOCUMENTATION*