changelog and thanks for the preceding fix

Conflicts:
	ChangeLog
	THANKS