I don't know what these changes are. I didn't want to lose them.
Merge branch 'misc_2014-10-20'

Conflicts:
	Makefile
	adey.c
Indent.