Update
Merge branch 'new'

Conflicts:
	tuareg.el