Consolidate Gary Funck's two ChangeLog entries.