tuning for init-linux for emacs24.4
Merge remote-tracking branch 'origin/master'