Commit for merge
Merge branch 'master' of github.com:sjolsen/emacs2