Re: emacs-24 r107805: international/characters.el: Fix sorting.

> This won't be (as much of) a problem if the commits to the emacs-24
> branch are labelled as "backport from trunk" or "merge from trunk" when
> appropriate.  Basically anything that bzrmerge-skip-regexp can recognize.

Yes, but better not abuse this.

> After 24.1 is released, trunk will be merged to emacs-24 in preparation
> for making 24.2 on the emacs-24 branch.

"After", yes, but not "right after".  IOW rather than "after 24.1", I'd
say "before the 24.2 release".

> In the meantime, emacs-24 can be merged to the trunk at any time.

Yes.

        Stefan