synch up from chamrousse
Merge branch 'master' of github.com:erch/customenv

Conflicts:
	emacsdir/emacs.d/cedet-conf.el