stuff...
Merge branch 'my-change' of github.com:vanicat/emacs24-starter-kit into my-change