Bzr top of the tree
Modified headers from bzr branch
Merge branch 'master' into mergemerge

Conflicts:
	cscope.out
	cuneiform_src/Kern/fon/src/clu_lang.c
	cuneiform_src/Kern/hrk/lang_def.h
	cuneiform_src/Kern/pass2/src/p2_choic.c
	cuneiform_src/Kern/pass2/src/p2_proc.c
	cuneiform_src/Kern/puma/c/enum.cpp
	cuneiform_src/Kern/rreccom/src/cpp/alphabet.cpp
	cuneiform_src/Kern/rstr/src/acc_tabs.c
	cuneiform_src/Kern/rstr/src/accents.c
	cuneiform_src/Kern/rstr/src/diff.c
	cuneiform_src/Kern/rstr/src/erection.c
	cuneiform_src/Kern/rstr/src/il1tg.c
	cuneiform_src/Kern/rstr/src/pass3.c
	cuneiform_src/Kern/rstr/src/punct.c
	cuneiform_src/Kern/rstr/src/rcm.c
	cuneiform_src/Kern/rstr/src/stic_dis.c
	cuneiform_src/cli/cuneiform-cli.cpp
Modifications to make code compile
Merge branch 'master' of github.com:begemotv2718/cuneiform-by