cedet seems to work
Merge branch 'master' of github.com:rushba/me

Conflicts:
	me-cc.org