modified:   Makefile
	modified:   macro_defines.mk
	modified:   make_build_paths.mk
	modified:   make_environment.mk
	modified:   make_var_define.mk
	new file:   share/Makefile
	new file:   share/inc/master_slave_switch.h
	new file:   share/inc/zookeeper_foundation.h
	new file:   share/src/master_slave_switch.cpp
	new file:   share/src/zookeeper_foundation.cpp
	deleted:    src/.zktest.cpp.swp
	modified:   src/Makefile
	modified:   src/zktest.cpp
	modified:   tags
Merge branch 'master' of https://github.com/billypu/cotools

Merge