pkgs
Merge branch 'master' of github.com:cycojesus/emacs

Conflicts:
	saved-packages