Merge branch 'deletelocal' into blead

diff --cc embed.fnc
Simple merge
diff --cc embed.h
Simple merge
diff --cc proto.h
Simple merge
		1	2
embed.fnc	patch \|	diff1 \|	diff2 \|	blob \| history
embed.h	patch \|	diff1 \|	diff2 \|	blob \| history
proto.h	patch \|	diff1 \|	diff2 \|	blob \| history