Fixed a mess-up in the changelog.

Not sure what has happened --- perhaps some of the markers were off and
that confused the update script?

Will need to watch out for the next RC run.
Merge branch 'rc'