Minor changes
nor changes
A
A
A
B
Merge branch 'master' of https://github.com/FabienCesari/emacsConfig

Conflicts:
	external/cedet