whoops, forgot to pull before modifying the ChangeLog.. merge conflict