>> > Since the log messages say "do not merge to trunk" (because the trunk
>> > already had such Copyright changes), I assumed Glenn didn't. Glenn?
>> I used bzrmerge.el. You'd have to ask Stefan what it does, exactly.
> Stefan?
Yes?
Stefan