more or less back to where I was before the conflict
[hw/telelcotwo] / Makefile
2015-11-16 Keith Packardimport