some random crap
Merge branch 'master' of http://www.github.com/ccann/emacs