Thu Jan 30 17:00:01 CET 2014
Merge https://github.com/chofer32/emacs
*** empty log message ***
Thu Jan 30 22:00:05 CET 2014