just commit it
Merge branch 'master' of github.com:dongxiong/.emacs.d