Update ChangeLog.

Conflicts:

	ChangeLog