Update from pek2-dbc102
Merge branch 'pek2-dbc102'

Conflicts:
	cedet.el
	main.el
	package.el