Merge MPW ChangeLog with generic ChangeLog