changes from dakara
Merge branch 'master' of github.com:sjolsen/emacs2