little change
Merge branch 'master' of https://github.com/kzjeef/myconfigure

Conflicts:
	emacs